drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,428 Commits 1 Branch 0 Tags
Commit Graph

176428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
b12f2410c7 Only Windows doesn't have %zd. 
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
 2015-04-03 12:56:45 -07:00
Alex Klyubin
64b0062a37 Merge "Load fewer classes when AndroidKeyStore provider is installed." 2015-04-03 19:47:17 +00:00
Alex Klyubin
6def5afcbc Load fewer classes when AndroidKeyStore provider is installed. 
This avoids loading all AndroidKeyStore crypto SPI classes when the
AndroidKeyStore provider is instantiated and installed. This provider
is installed early on during the initialization of each app. Most apps
don't need these classes loaded.

Bug: 18088752
Change-Id: Ib43c9dd6a7d434b128916e0f9c8652ba61df0d47
 2015-04-03 12:45:16 -07:00
Alex Klyubin
b068f162a4 am 376b23e6: am 08963653: Merge "Rename KeymasterException to KeyStoreException." 
* commit '376b23e6fdda35cc6fa61ea9a3c10d109fe2d601':
  Rename KeymasterException to KeyStoreException.
 2015-04-03 19:43:43 +00:00
Chad Brubaker
54d583c148 am e797eb2e: am 377885e1: Merge "Mark all test keys as no auth required" 
* commit 'e797eb2eea885f086465e47efc464adcd0d7acea':
  Mark all test keys as no auth required
 2015-04-03 19:43:38 +00:00
Alex Klyubin
c869ac1b7d am ec029e55: am b292e49b: Merge "Obtain SPI without using Reflection." 
* commit 'ec029e551641982294d9b346b741c84d2510d670':
  Obtain SPI without using Reflection.
 2015-04-03 19:43:33 +00:00
Alex Klyubin
376b23e6fd am 08963653: Merge "Rename KeymasterException to KeyStoreException." 
* commit '08963653fc9434d2f50d3c8e64c757138efd102e':
  Rename KeymasterException to KeyStoreException.
 2015-04-03 19:33:27 +00:00
Chad Brubaker
e797eb2eea am 377885e1: Merge "Mark all test keys as no auth required" 
* commit '377885e1e6a4efc727060cca241fea29114315d5':
  Mark all test keys as no auth required
 2015-04-03 19:33:21 +00:00
Alex Klyubin
ec029e5516 am b292e49b: Merge "Obtain SPI without using Reflection." 
* commit 'b292e49b32fa321e59bf88c68e4c4d8c139645dd':
  Obtain SPI without using Reflection.
 2015-04-03 19:33:14 +00:00
Alex Klyubin
08963653fc Merge "Rename KeymasterException to KeyStoreException." 2015-04-03 19:13:49 +00:00
Chad Brubaker
377885e1e6 Merge "Mark all test keys as no auth required" 2015-04-03 19:13:37 +00:00
Alex Klyubin
b292e49b32 Merge "Obtain SPI without using Reflection." 2015-04-03 19:13:18 +00:00
Alex Klyubin
a0f656f9bd Obtain SPI without using Reflection. 
Bug: 18088752
Change-Id: I76d42e17f5f28af6fd9a96ee812d286f6c6a085b
 2015-04-03 12:09:56 -07:00
Miao Wang
1327fa9eb1 am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added." 
* commit '511eb6609291d482266c0efce73bdf60509e86b8':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.
 2015-04-03 18:07:11 +00:00
Miao Wang
511eb66092 am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added." 
* commit '6aed9ec1b85ff1a8a39c4ec091a017f79413ead0':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.
 2015-04-03 17:55:42 +00:00
Miao Wang
6aed9ec1b8 Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added." 2015-04-03 17:38:14 +00:00
Miao Wang
d9b6328509 [RenderScript] update exception reporting for copyTo() after 
autoPadding added.

 - This CL fixes recent CTS failures about copyPadded after
   lmp-mr1-dev changes pushed to aosp.

Change-Id: Ica1f4fd934cd83ca4357ea7e7c82dcc7f844b689
 2015-04-03 09:15:39 -07:00
Wale Ogunwale
48d6a96b2b am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
* commit 'fce4220b88006a1e626fc4c63d8bd785d465965a':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-03 00:46:09 +00:00
Wale Ogunwale
fce4220b88 am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
* commit '5fd6b139033bcaab52921473ab3998725e157002':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-03 00:36:56 +00:00
Wale Ogunwale
5fd6b13903 am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
* commit '4a7967ad9ac76d8b9d6285bc367c33d1b6c83235':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-03 00:26:49 +00:00
Wale Ogunwale
4a7967ad9a am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-03 00:15:26 +00:00
Wale Ogunwale
f61aee97ad Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 2015-04-03 00:07:04 +00:00
Wale Ogunwale
70e12aa123 [DO NOT MERGE] Fixed NPE when trying to animate a window without display 
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Bug: 19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
 2015-04-02 16:38:52 -07:00
Fyodor Kupolov
30c688da8b am 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app directory" 
* commit '031898dfd2dd734724d61e447a8ed61cc7f07d5c':
  Support for storing OAT files in app directory
 2015-04-02 23:38:19 +00:00
Fyodor Kupolov
031898dfd2 am 3d8b7f4d: Merge "Support for storing OAT files in app directory" 
* commit '3d8b7f4d50c2f7c64ec4e5874fd95cf837ddc12e':
  Support for storing OAT files in app directory
 2015-04-02 23:27:38 +00:00
Filip Gruszczynski
c069f921d9 Make burn in protection updates happen on the minute. 
Bug: 20052872

Change-Id: Iff7e081a9ae99b457024537b8c64b7c2572b6172
 2015-04-02 16:19:35 -07:00
Simon Wilson
fd395ce7f3 am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 
* commit 'd007782986a8b4b90ab622339749271993379839':
  Frameworks/base: Support dex2oat threads system property
 2015-04-02 23:12:23 +00:00
Fyodor Kupolov
3d8b7f4d50 Merge "Support for storing OAT files in app directory" 2015-04-02 23:11:11 +00:00
younghwan1.kim
cd005ebf76 [ActivityManager] Do not add service to reschedule after removing users. 
Some service which has persistent attribute has restarted again and
again after removing users.
but it dies right after launching because it is not valid in owner mode.

This patch will check service's userId whether userId is alive or not.
And then if userId is not alive, then service will bring down.

Change-Id: Id99bf3c651b88e377f1fd6bec8aaad81318d7579
 2015-04-03 08:08:30 +09:00
Simon Wilson
d007782986 am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 
* commit 'fb397cf827d2f0c2e1a2aca496c75752da11bc3f':
  Frameworks/base: Support dex2oat threads system property
 2015-04-02 23:04:25 +00:00
Alex Klyubin
b4834ae3fa Rename KeymasterException to KeyStoreException. 
The code in question talks to KeyStore which returns error codes
which are a mix of keystore and keymaster error codes. To better
match the layering of KeyStore on top of keystore and keymaster,
this CL renames KeymasterException into KeyStoreException. It also
adds human-readable error messages to exceptions raised by keystore
rather than keymaster (e.g., key not found).

Bug: 18088752
Change-Id: I4cd1235e16518c9f2e8c5557a457774c6e687b88
 2015-04-02 15:57:27 -07:00
Chad Brubaker
ce7ad24b63 Mark all test keys as no auth required 
Now that auth token checks are in keystore keys without any auth tags
are invalid.

Also adds a test to check that a key with auth required fails when none
is present.

Change-Id: I0d5d44d70a849978e9b2e809675b8343c6650ff2
 2015-04-02 14:41:37 -07:00
Alex Klyubin
58031d5eb5 am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '378df98eab65547f62cb900e9dca0b7419095755':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 21:34:52 +00:00
Alex Klyubin
e7e705d494 am acee5b2b: am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec." 
* commit 'acee5b2b4902479fabfb557aba745d352d49ce1a':
  Expose new key use constraints in KeyPairGeneratorSpec.
 2015-04-02 21:34:48 +00:00
Alex Klyubin
378df98eab am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 21:25:56 +00:00
Alex Klyubin
acee5b2b49 am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec." 
* commit '9635a56acfe3318d9ae5020727090a2dc8c118d0':
  Expose new key use constraints in KeyPairGeneratorSpec.
 2015-04-02 21:25:50 +00:00
Jason Sams
37192dcde3 Fix minor blur doc bug 
Change-Id: I4c129d9d3c93d8a36c887e5c594b4402aca5745e
 2015-04-02 14:10:53 -07:00
Alex Klyubin
3cc9e5d68d Merge "Improve the AndroidKeyStore-backed HMAC state machine." 2015-04-02 21:06:28 +00:00
Alex Klyubin
9635a56acf Merge "Expose new key use constraints in KeyPairGeneratorSpec." 2015-04-02 21:03:11 +00:00
Simon Wilson
fb397cf827 Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 2015-04-02 20:57:53 +00:00
Alex Klyubin
a44e7fd622 am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit '957e982cd5fdbf45817500abf68fe8a0689adc34':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 20:53:05 +00:00
Alex Klyubin
957e982cd5 am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit 'd2eec1a7865dd552114b330fce1a1472a9e08806':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 20:42:59 +00:00
Andrew Solovay
93b3d66587 am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '7818f205e5b18d8d7fddcf01736d546cb08bfd62':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:29:28 +00:00
Yuichi Araki
428c2fa0f8 am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'c3fbf13d525a0bcf1202618b197f4160750b54f1':
  Fix a broken link in javadoc
 2015-04-02 20:29:24 +00:00
Alex Klyubin
d2eec1a786 Merge "Add exception types for AndroidKeyStore key validity issues." 2015-04-02 20:24:48 +00:00
Andrew Solovay
7818f205e5 am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f99a16c943a4366bdfdba19534457f9e45538f7d':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:19:15 +00:00
Yuichi Araki
c3fbf13d52 am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'e2fc3adbb4040400496aebdab80c4cac1083da27':
  Fix a broken link in javadoc
 2015-04-02 20:19:09 +00:00
Andrew Solovay
f99a16c943 am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:10:55 +00:00
Yuichi Araki
e2fc3adbb4 am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit '61ce6c9b705e41800662b33601c01a4848c174d3':
  Fix a broken link in javadoc
 2015-04-02 20:10:48 +00:00
Andrew Solovay
589a272e97 am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 19:56:41 +00:00