OSDN Git Service
Olawale Ogunwale [Wed, 1 Apr 2015 14:58:20 +0000 (14:58 +0000)]
Merge "[ActivityManager] Improve multi-thread access the same provider"
riddle_hsu [Wed, 1 Apr 2015 07:06:18 +0000 (15:06 +0800)]
[ActivityManager] Improve multi-thread access the same provider
Application may use many threads to load data from provider.
If the target provider needs to start process, each access
will occupy one binder thread of system server until the
provider process started and published.
Sometimes application uses more than 16 threads to access
the same provider, and the provider process needs a little
long time to start, then all binder threads of system server
are waiting. But when the provider is ready, it is unable to
publish to notify those waiting threads because no availabe
binder thread to use. And device will become almost hang.
Improvement:
If there is already a thread acquiring provider, let other threads
(which try to acquire the same provider) wait the result of the
first one. That reduces IPC to save binder thread of system server.
Remove calling removeContentProvider in installProvider because
we have ensured only get one provider holder for the same provider,
the original race that gets a new useless holder will not happen.
Change-Id: I521f2603db8ced56912f5dc54342a70451e68381
Alex Klyubin [Wed, 1 Apr 2015 00:47:00 +0000 (00:47 +0000)]
Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
Alex Klyubin [Wed, 1 Apr 2015 00:16:31 +0000 (17:16 -0700)]
UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
This is to follow naming from keymaster_defs.h
Bug:
18088752
Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59
Alex Klyubin [Tue, 31 Mar 2015 23:52:45 +0000 (23:52 +0000)]
Merge "Add license banner to recently added AndroidKeyStore files."
Alex Klyubin [Tue, 31 Mar 2015 23:50:37 +0000 (16:50 -0700)]
Add license banner to recently added AndroidKeyStore files.
Bug:
18088752
Change-Id: I027f9530a02cca081aae8eb94833d2fdcb678e9a
Alex Klyubin [Tue, 31 Mar 2015 23:32:40 +0000 (23:32 +0000)]
Merge "Add SecretKeyFactory backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 22:26:56 +0000 (15:26 -0700)]
Add SecretKeyFactory backed by AndroidKeyStore.
This factory provides a way to obtain information about a SecretKey
backed by AndroidKeyStore. The information is provided in a form of an
instance of KeyStoreKeySpec class.
EXAMPLE
SecretKeyFactory factory = SecretKeyFactory.getInstance(
key.getAlgorithm(), "AndroidKeyStore");
KeyStoreKeySpec keySpec =
factory.getKeySpec(key, KeyStoreKeySpec.class);
Bug:
18088752
Change-Id: I26c9dd544f80230fe7039501eeb471eaf875452b
Craig Mautner [Tue, 31 Mar 2015 22:22:46 +0000 (22:22 +0000)]
Merge "Clear the previous states before setting the new app visibility"
Yang Ni [Tue, 31 Mar 2015 21:32:23 +0000 (21:32 +0000)]
Merge "Fix value size data type in closure creation."
Alex Klyubin [Tue, 31 Mar 2015 21:00:16 +0000 (21:00 +0000)]
Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
Alex Klyubin [Tue, 31 Mar 2015 20:39:38 +0000 (13:39 -0700)]
Add unauthenticated AES ciphers backed by AndroidKeyStore.
This adds the following AES transformations:
* AES/ECB/NoPadding
* AES/ECB/PKCS7Padding
* AES/CBC/NoPadding
* AES/CBC/PKCS7Padding
* AES/CTR/NoPadding
Bug:
18088752
Change-Id: I3e4702e59868f8f2225c31b1c159d20008b9999d
Chad Brubaker [Tue, 31 Mar 2015 17:49:15 +0000 (17:49 +0000)]
Merge "Include operation handle in OperationResult"
Olawale Ogunwale [Tue, 31 Mar 2015 16:09:16 +0000 (16:09 +0000)]
Merge "[ActivityManager] Fix index out of bounds when updating next pss time."
Neil Fuller [Tue, 31 Mar 2015 08:30:59 +0000 (08:30 +0000)]
Merge "An updater for all timezone data on a device"
riddle_hsu [Tue, 31 Mar 2015 03:54:14 +0000 (11:54 +0800)]
[ActivityManager] Fix index out of bounds when updating next pss time.
Symptom:
System server crash.
Root Cause:
The value curProcState for array index is -1 if the process
has not attached yet.
Solution:
Skip computing for process which is not attached or curProcState
is nonexistent state.
Change-Id: I71aaf45bb78d73097ebe9dfebf76b72f2d243232
Andreas Gampe [Tue, 31 Mar 2015 03:20:09 +0000 (03:20 +0000)]
Merge "Frameworks/base: Support dex2oat threads system property"
Andreas Gampe [Tue, 31 Mar 2015 01:43:39 +0000 (18:43 -0700)]
Frameworks/base: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.
Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.
Bug:
19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
Olawale Ogunwale [Mon, 30 Mar 2015 22:00:08 +0000 (22:00 +0000)]
Merge "Add ProcessInfoService to activity manager."
Alex Klyubin [Mon, 30 Mar 2015 20:34:47 +0000 (20:34 +0000)]
Merge "Add HmacSHA256 backed by AndroidKeyStore."
Chad Brubaker [Mon, 30 Mar 2015 20:06:29 +0000 (20:06 +0000)]
Merge "Add authorization binder methods"
Alex Klyubin [Fri, 27 Mar 2015 23:53:44 +0000 (16:53 -0700)]
Add HmacSHA256 backed by AndroidKeyStore.
This also adds the MAC length constraint on imported HMAC keys. HMAC
doesn't work without this constraint at the moment.
Bug:
18088752
Change-Id: I8613f58f5d2a84df00bcf6179d13e30619440330
Ruben Brunk [Wed, 28 Jan 2015 23:04:16 +0000 (15:04 -0800)]
Add ProcessInfoService to activity manager.
- Adds a new AIDL interface for querying process
information from activity manager.
Bug:
19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
Yang Ni [Thu, 26 Mar 2015 21:35:22 +0000 (14:35 -0700)]
Fix value size data type in closure creation.
b/
19944127
Also added references to arguments and global values in a closure to
keep them live in Java while native code may access them.
Change-Id: I1179d34aa67f845578740e71cc2da4f82419f251
Mathieu Chartier [Sun, 29 Mar 2015 22:30:41 +0000 (22:30 +0000)]
Merge "Change getDeclaredFieldsUnchecked call to new return value"
Andreas Gampe [Sat, 28 Mar 2015 04:50:42 +0000 (04:50 +0000)]
Merge "Frameworks/base: Change String == to equals in Preference"
Andreas Gampe [Sat, 28 Mar 2015 04:50:07 +0000 (04:50 +0000)]
Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
Mathieu Chartier [Wed, 25 Mar 2015 20:35:38 +0000 (13:35 -0700)]
Change getDeclaredFieldsUnchecked call to new return value
Required for related libcore change.
Bug:
19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
Alex Klyubin [Fri, 27 Mar 2015 22:59:18 +0000 (22:59 +0000)]
Merge "Symmetric key generation for AndroidKeyStore."
Alex Klyubin [Fri, 27 Mar 2015 21:39:28 +0000 (14:39 -0700)]
Symmetric key generation for AndroidKeyStore.
This currently supports AES and HMAC with SHA-256.
Bug:
18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
Chad Brubaker [Fri, 27 Mar 2015 21:38:43 +0000 (21:38 +0000)]
Merge "Allow entropy to be provided to some operations"
Chad Brubaker [Fri, 27 Mar 2015 21:28:35 +0000 (14:28 -0700)]
Allow entropy to be provided to some operations
generateKey and begin can now optionally take an array of bytes to add
to the rng entropy of the device before the operation. If entropy is
specified and the device does not support add_rng_entropy or the call
fails then that device will not be used, leading to fallback or error
depending on the situation.
Change-Id: Id7d33e3cc959594dfa5483d002993ba35c1fb134
Alex Klyubin [Fri, 27 Mar 2015 19:21:12 +0000 (19:21 +0000)]
Merge "Symmetric key import for AndroidKeyStore."
Jason Sams [Fri, 27 Mar 2015 00:58:43 +0000 (00:58 +0000)]
Merge "Fix doc bug for object size."
Jason Sams [Fri, 27 Mar 2015 00:39:34 +0000 (17:39 -0700)]
Fix doc bug for object size.
Change-Id: I3c810abcb9734196bd8804a22efc010dd3a73291
Alex Klyubin [Thu, 26 Mar 2015 21:46:55 +0000 (14:46 -0700)]
Symmetric key import for AndroidKeyStore.
AES and HmacSHA256 symmetric keys can now be imported into
AndroidKeyStore. These keys cannot yet be used.
Bug:
18088752
Change-Id: Iad2fd49d15ac4c2d676abe1153f5b5f0b6ff496c
Jason Sams [Thu, 26 Mar 2015 22:30:43 +0000 (22:30 +0000)]
Merge "Catch errors for unknown object types."
Jason Sams [Thu, 26 Mar 2015 22:29:56 +0000 (15:29 -0700)]
Catch errors for unknown object types.
bug
19805334
Change-Id: I71e172b8123076896737d352403f8ddefca544b6
Jason Sams [Thu, 26 Mar 2015 22:10:46 +0000 (22:10 +0000)]
Merge "Fix potential npe"
Robert Greenwalt [Thu, 26 Mar 2015 22:01:32 +0000 (22:01 +0000)]
Merge "Add getLegacyVpnInfoPrivileged method"
Jason Sams [Thu, 26 Mar 2015 21:47:17 +0000 (14:47 -0700)]
Fix potential npe
bug
19805515
Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
Neil Fuller [Fri, 13 Mar 2015 14:27:34 +0000 (14:27 +0000)]
An updater for all timezone data on a device
The existing one, being deleted here, did not work properly: it only
updated the file used by libcore and bionic, it did not update the ICU
data.
Most of the installation logic exists in code in libcore/tzdata that is
independent of the server code so that it can be tested.
Bug:
19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
tiger_huang [Thu, 13 Nov 2014 10:22:44 +0000 (18:22 +0800)]
Clear the previous states before setting the new app visibility
If setAppVisibility() is called multiple times in a short interval
while the screen is turned off between the calls, the visibility of
the app would be wrong. For example, the user may see the app under
the launcher, not the wallpaper under the launcher.
The flow to the issue:
1. Screen is on.
2. AM calls setAppVisibility() token=App A's token, visible=true
3. Screen is turned off.
4. AM calls setAppVisibility() token=App A's token, visible=false
Note:
a. In 2., WM would put App A into mOpeningApps, and tell it to be
visible.
b. In 4., because the screen is off now, App A would not be removed
from mOpeningApps. App A might be told to be invisible directly
through setTokenVisibilityLocked(), but it would be told to be
visible again in handleAppTransitionReadyLocked() later.
Change-Id: Icf3d69031ea2822245008248ec8f12bd57218880
Alan Viverette [Wed, 25 Mar 2015 20:04:21 +0000 (20:04 +0000)]
Merge "Consider RTL layout in DPAD navigation in Gallery"
Chad Brubaker [Wed, 25 Mar 2015 19:35:00 +0000 (19:35 +0000)]
Merge "Use correct tag type for RSA exponent"
Chad Brubaker [Wed, 25 Mar 2015 19:25:54 +0000 (19:25 +0000)]
Merge "Make application/client id an object"
Alex Klyubin [Wed, 25 Mar 2015 18:13:18 +0000 (18:13 +0000)]
Merge "Framework's NetworkSecurityPolicy delegates to libcore's one."
Chad Brubaker [Wed, 25 Mar 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Enforce tag types in KeymasterArgument classes"
Alan Viverette [Wed, 25 Mar 2015 16:35:35 +0000 (16:35 +0000)]
Merge "Fix to crash when clicking text link without view activity"
Chris Craik [Wed, 25 Mar 2015 16:15:11 +0000 (16:15 +0000)]
Merge "hwui : fix memory leak due to duplicate in shadow cache"
Alex Klyubin [Wed, 25 Mar 2015 16:00:37 +0000 (09:00 -0700)]
Framework's NetworkSecurityPolicy delegates to libcore's one.
Now that the libcore's NetworkSecurityPolicy abstraction is in place,
the framework version of the abstraction should delegate to the
libcore one, to avoid them getting out of sync.
Bug:
19215516
Change-Id: Ic57341d703a13e0fb100dc414958e8fd54e03816
Alex Klyubin [Wed, 25 Mar 2015 15:34:35 +0000 (15:34 +0000)]
Merge "Address pending comments for NetworkSecurityPolicy."
Jason Monk [Wed, 25 Mar 2015 14:12:12 +0000 (14:12 +0000)]
Merge "Sort Bluetooth devices in quick settings by name"
Jason Monk [Tue, 24 Mar 2015 19:57:48 +0000 (19:57 +0000)]
Merge "systemui: Handle case when network has been lost"
Alex Klyubin [Mon, 23 Mar 2015 17:51:20 +0000 (10:51 -0700)]
Address pending comments for NetworkSecurityPolicy.
This is a follow-up to
https://android-review.googlesource.com/#/c/131920/, addressing some
outstanding comments.
This CL also switches the source file to the correct indentation.
Bug:
19215516
Change-Id: Ia48455ab351081e11619afcccadb8fa90340391d
Olawale Ogunwale [Tue, 24 Mar 2015 16:12:22 +0000 (16:12 +0000)]
Merge "[ActivityManager] Avoid killing unrelated processes."
Olawale Ogunwale [Tue, 24 Mar 2015 16:11:37 +0000 (16:11 +0000)]
Merge "Layout the window to be displayed if it would be resized"
Olawale Ogunwale [Tue, 24 Mar 2015 16:10:47 +0000 (16:10 +0000)]
Merge "DimLayer : remove unnecessary surface transaction calls"
Andreas Gampe [Tue, 24 Mar 2015 16:02:53 +0000 (16:02 +0000)]
Merge "Frameworks/base: Don't allocate another identity matrix"
Mathias Jeppsson [Mon, 23 Mar 2015 08:00:30 +0000 (09:00 +0100)]
Sort Bluetooth devices in quick settings by name
To avoid Bluetooth devices moving randomly in list, sorting by name.
Change-Id: I4f8e9f98fa29f9670678a3bb6051a6fcf7ae0b9d
John Reck [Tue, 24 Mar 2015 14:44:04 +0000 (14:44 +0000)]
Merge "Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'"
Dohyun Lee [Mon, 23 Mar 2015 00:16:34 +0000 (09:16 +0900)]
DimLayer : remove unnecessary surface transaction calls
There is the case that adjustSurface() get called even if
the size of the surface of DimLayer is not changed actually.
Since changing the size of a surface is processed synchronously
in the SurfacFlinger, there is usually a few milliseconds delay
(up to 1 vsync interval) when we launch an application.
This patch avoids such cases.
Change-Id: Ib1f76d54f9f2364ac54b70120e4b781e8534e750
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
Craig Mautner [Mon, 23 Mar 2015 21:48:55 +0000 (21:48 +0000)]
Merge "Prevent unexpected rotation while going back to keyguard"
Miao Wang [Mon, 23 Mar 2015 21:01:58 +0000 (21:01 +0000)]
Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
Miao Wang [Mon, 23 Mar 2015 18:09:56 +0000 (11:09 -0700)]
[RenderScript] Add create(Context, int) to be compatible with
the thunker layer & minor tweaks.
bug:
19888167
bug:
19888339
Change-Id: Ib264c4ca48c990b3476456838047f73d95f6752f
Michael Wright [Mon, 23 Mar 2015 15:43:23 +0000 (15:43 +0000)]
Merge "SystemUI needs the SET_WALLPAPER permission"
Samuel Asteberg [Wed, 25 Feb 2015 14:51:05 +0000 (15:51 +0100)]
SystemUI needs the SET_WALLPAPER permission
If changing wallpaper when low on memory, retrieving the default
wallpaper may return null, which triggers error handling in
ImageWallpaper. This error handling tries to perform
WallpaperManager.clear(), but for that it needs SET_WALLPAPER
permission, which it does not have.
For users with apps that auto change wallpaper, this issue can
be frequent in low-memory conditions.
The solution is to add the permisson.
Change-Id: I81503c1667e3952c2dd15599969f7dcc51623e5b
tiger_huang [Thu, 26 Feb 2015 06:45:32 +0000 (14:45 +0800)]
Prevent unexpected rotation while going back to keyguard
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.
https://code.google.com/p/android/issues/detail?id=155640
Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
sj.cha [Mon, 23 Mar 2015 02:35:24 +0000 (11:35 +0900)]
Add getLegacyVpnInfoPrivileged method
Follows the Google's permission check policy.
Add a getLegacyVpnInfoPrivileged method which skips the permission check
and change getLegacyVpnInfo to check the permission and then call getLegacyVpnInfoPrivileged.
It is already checked in this commit : https://android-review.googlesource.com/#/c/141771/
Signed-off-by: SangJin Cha <sj.cha@lge.com>
Change-Id: I83cfaedbd85745574f3ddf118b11b6e0415483c6
Chad Brubaker [Sun, 22 Mar 2015 11:56:46 +0000 (04:56 -0700)]
Enforce tag types in KeymasterArgument classes
Change-Id: Ib1aca884a0b42c3e245db65d48c945b34935072d
Chad Brubaker [Sun, 22 Mar 2015 11:45:32 +0000 (04:45 -0700)]
Use correct tag type for RSA exponent
Change-Id: I957c4469401953d2298751c655ca8e9f95b9511d
Chad Brubaker [Sun, 22 Mar 2015 05:46:43 +0000 (22:46 -0700)]
Make application/client id an object
Having it as a raw byte[] caused issues in keystore because keymaster
handles a null blob differently than a blob with null contents. Make
this explicit in the API.
Change-Id: Ifcf550f438608b8f09fc589d00d06fffa6ee463b
Alan Viverette [Sat, 21 Mar 2015 20:06:56 +0000 (20:06 +0000)]
Merge "Move arrow_pointer hotspot to better match actual tip"
Chad Brubaker [Sat, 21 Mar 2015 19:18:23 +0000 (19:18 +0000)]
Merge "Specify public exponent for RSA"
Chad Brubaker [Fri, 20 Mar 2015 21:03:49 +0000 (14:03 -0700)]
Specify public exponent for RSA
Keymaster no longer adds a default value, so these tests were failing.
Change-Id: I9c5a8d2552534db1d7fa77965b0d675acc3ccc0a
Chad Brubaker [Wed, 18 Mar 2015 01:23:10 +0000 (18:23 -0700)]
Include operation handle in OperationResult
Some authorization code needs to know the actual underlying operation
handle, not simply a reference to it, so return it in case it is needed.
Note that the handle cannot be used by the application to reference an
operation.
Change-Id: I4c883dde17168b7f6c1643d81741a4c2686d3159
Johan Redestig [Tue, 22 Jan 2013 09:30:55 +0000 (10:30 +0100)]
Consider RTL layout in DPAD navigation in Gallery
Since the Gallery view changes direction the key events LEFT and
RIGHT should swap actions.
Change-Id: Iaeb9cce83e138f315f12ea188de142e67a60d574
Alex Klyubin [Fri, 20 Mar 2015 17:56:25 +0000 (17:56 +0000)]
Merge "Add android.security.NetworkSecurityPolicy."
youngmin0822.lee [Fri, 20 Mar 2015 12:22:32 +0000 (21:22 +0900)]
Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'
To obtain the gfxinfo for each process, the static method of RenderProxy is used, which is named outputLogBuffer().
In there,
1. RenderTask is created for getting DisplayList Commands in RenderNode.
2. staticPostAndWait() is called
3. RenderThread's instance is created by 'RenderThread::getInstance()' in staticPostAndWait()
In case of the service, they don't use HW Acceleration, so don't need RenderThread.
But, by the process of No.3, RenderThread is created for all process.
As we know, RenderThread never be destroyed while the process is alive.
This patch checks RenderThread instance before the creation of RenderTask.
And, there is no one, just return to prevent the unnecessay creation of it.
Change-Id: I4fe29d83c9ced3e8b67177c0874c5d8ee62e1870
Yang Ni [Thu, 19 Mar 2015 23:21:27 +0000 (23:21 +0000)]
Merge "New API methods for Script Group"
Yang Ni [Wed, 11 Mar 2015 23:25:37 +0000 (16:25 -0700)]
New API methods for Script Group
Use a single vararg Object array for both kernel/invoke arguments
and global bindings. The assumption is that global bindings are in
the end after the kernel/invoke arguments.
This simplifies the api to add a kernel or invoke to a script group.
Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2
Yang Ni [Thu, 19 Mar 2015 21:28:13 +0000 (21:28 +0000)]
Merge "Added copyright notice and formatted to convention"
Miao Wang [Thu, 19 Mar 2015 20:35:55 +0000 (20:35 +0000)]
Merge "[RenderScript] Remove duplicate include in jni"
Jason Sams [Thu, 19 Mar 2015 18:38:14 +0000 (18:38 +0000)]
Merge "Make it harder to leak contexts"
Elliott Hughes [Thu, 19 Mar 2015 18:06:17 +0000 (18:06 +0000)]
Merge "Remove unused printapk.cpp."
Alex Klyubin [Thu, 12 Feb 2015 19:43:09 +0000 (11:43 -0800)]
Add android.security.NetworkSecurityPolicy.
The initial purpose of the NetworkSecurityPolicy class is to provide a
way for network libraries to check whether cleartext network traffic
(e.g., HTTP, WebSockets, XMPP, IMAP, SMTP) should be blocked from this
process.
The policy is set declaratively by the app developer in the app's
manifest and can be queried from ApplicationInfo.flags. Unfortunately,
several network stacks (bundled and unbundled) do not have a reference
to ApplicationInfo or Context.
Alternatives:
* Keep this API hidden (and thus potentially move it from framework to
libcore), thus precluding unbundled HTTP stacks from using the API.
* Introduce a new java.lang.System property instead of this API.
However, such properties are a mess and not as powerful/extensible
as a public class.
Bug:
19215516
Change-Id: If22056a74d257bf1d805ebb4fc284240b3d338f1
Mathieu Chartier [Thu, 19 Mar 2015 16:44:58 +0000 (16:44 +0000)]
Merge "Revert "Change jit properties to be debug properties""
Alex Klyubin [Thu, 19 Mar 2015 16:10:20 +0000 (16:10 +0000)]
Merge "Add app-level usesCleartextTraffic manifest attribute."
Elliott Hughes [Thu, 19 Mar 2015 16:03:41 +0000 (09:03 -0700)]
Remove unused printapk.cpp.
This is one of the few remaining users of libzipfile, but doesn't get built.
Not worth porting to libziparchive.
Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
Miao Wang [Thu, 19 Mar 2015 02:16:47 +0000 (19:16 -0700)]
[RenderScript] Remove duplicate include in jni
Change-Id: Ib6019ab22a83d952dce3fd6f5351120d94b49d58
Mathieu Chartier [Thu, 19 Mar 2015 01:54:36 +0000 (18:54 -0700)]
Revert "Change jit properties to be debug properties"
Bug:
19735273
This reverts commit
1ad10ef1e4b83ef9e845761a82e202bb57e2379d.
Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
Shawn Willden [Thu, 19 Mar 2015 00:30:30 +0000 (00:30 +0000)]
Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
Shawn Willden [Thu, 19 Mar 2015 00:28:39 +0000 (18:28 -0600)]
Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
Also change to an ENUM, to match changes in keymaster_defs.h
Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347
Shawn Willden [Thu, 19 Mar 2015 00:27:37 +0000 (00:27 +0000)]
Merge changes Id9a22ad3,I629ab2c4
* changes:
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
Andreas Gampe [Wed, 18 Mar 2015 04:47:42 +0000 (21:47 -0700)]
Frameworks/base: Change String == to equals in Preference
Bug:
19797138
Change-Id: I496b12c425da45ee098db12e72ad843c22444ba3
Jason Sams [Thu, 19 Mar 2015 00:04:18 +0000 (17:04 -0700)]
Make it harder to leak contexts
Change-Id: Ied60b6428bedb200d7b5b627e8196fbf2b4151e1
Mathieu Chartier [Wed, 18 Mar 2015 22:56:54 +0000 (22:56 +0000)]
Merge "Add JIT late override property"
Andreas Gampe [Wed, 18 Mar 2015 22:19:58 +0000 (22:19 +0000)]
Merge "Frameworks/base: Fix potential NPE in InputMethod"
Andreas Gampe [Wed, 18 Mar 2015 22:19:26 +0000 (22:19 +0000)]
Merge "Frameworks/base: Remove duplicate check in Mesh"
Andreas Gampe [Wed, 18 Mar 2015 22:19:07 +0000 (22:19 +0000)]
Merge "Frameworks/base: Fix visibility flag in Editor"