174682 Commits

Author SHA1 Message Date
Alex Klyubin
6a6f0c7de2 Merge "Add HmacSHA256 backed by AndroidKeyStore." 2015-03-30 20:34:48 +00:00
Chad Brubaker
f603e28614 Merge "Add authorization binder methods" 2015-03-30 20:06:39 +00:00
Alex Klyubin
4ab8ea4498 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
2015-03-30 12:53:23 -07:00
Mathieu Chartier
631565abd6 Merge "Change getDeclaredFieldsUnchecked call to new return value" 2015-03-29 22:30:41 +00:00
Andreas Gampe
a01250c774 Merge "Frameworks/base: Change String == to equals in Preference" 2015-03-28 04:50:44 +00:00
Andreas Gampe
5a15bf69d8 Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 2015-03-28 04:50:08 +00:00
Mathieu Chartier
3d529c5b0a Change getDeclaredFieldsUnchecked call to new return value
Required for related libcore change.

Bug: 19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
2015-03-27 18:55:50 -07:00
Alex Klyubin
36ee836d2f Merge "Symmetric key generation for AndroidKeyStore." 2015-03-27 22:59:19 +00:00
Alex Klyubin
d23a1f706f Symmetric key generation for AndroidKeyStore.
This currently supports AES and HMAC with SHA-256.

Bug: 18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
2015-03-27 15:57:53 -07:00
Chad Brubaker
dbd9a4b651 Merge "Allow entropy to be provided to some operations" 2015-03-27 21:38:44 +00:00
Chad Brubaker
dae79e5408 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
2015-03-27 14:28:35 -07:00
Alex Klyubin
274a4ee344 Merge "Symmetric key import for AndroidKeyStore." 2015-03-27 19:21:13 +00:00
Jason Sams
ee80414d0d Merge "Fix doc bug for object size." 2015-03-27 00:58:46 +00:00
Jason Sams
fb4f5cf614 Fix doc bug for object size.
Change-Id: I3c810abcb9734196bd8804a22efc010dd3a73291
2015-03-26 17:39:34 -07:00
Alex Klyubin
baf2838fd2 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
2015-03-26 15:37:15 -07:00
Jason Sams
73ffe0cc23 Merge "Catch errors for unknown object types." 2015-03-26 22:30:43 +00:00
Jason Sams
bca8e6d35f Catch errors for unknown object types.
bug 19805334

Change-Id: I71e172b8123076896737d352403f8ddefca544b6
2015-03-26 15:29:56 -07:00
Jason Sams
22580b83f1 Merge "Fix potential npe" 2015-03-26 22:10:47 +00:00
Robert Greenwalt
727cac07cc Merge "Add getLegacyVpnInfoPrivileged method" 2015-03-26 22:01:33 +00:00
Jason Sams
ae5be38ebb Fix potential npe
bug 19805515

Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
2015-03-26 14:47:17 -07:00
Alan Viverette
5fc9b336eb Merge "Consider RTL layout in DPAD navigation in Gallery" 2015-03-25 20:04:22 +00:00
Chad Brubaker
704aa5ae48 Merge "Use correct tag type for RSA exponent" 2015-03-25 19:35:01 +00:00
Chad Brubaker
6326f96476 Merge "Make application/client id an object" 2015-03-25 19:25:55 +00:00
Alex Klyubin
a9f628662c Merge "Framework's NetworkSecurityPolicy delegates to libcore's one." 2015-03-25 18:13:18 +00:00
Chad Brubaker
5aeb085389 Merge "Enforce tag types in KeymasterArgument classes" 2015-03-25 18:00:48 +00:00
Alan Viverette
7506f499b5 Merge "Fix to crash when clicking text link without view activity" 2015-03-25 16:35:37 +00:00
Chris Craik
82f6b16e10 Merge "hwui : fix memory leak due to duplicate in shadow cache" 2015-03-25 16:15:12 +00:00
Alex Klyubin
403a494d56 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
2015-03-25 09:00:37 -07:00
Alex Klyubin
ff022cb1bd Merge "Address pending comments for NetworkSecurityPolicy." 2015-03-25 15:34:36 +00:00
Jason Monk
039013c28e Merge "Sort Bluetooth devices in quick settings by name" 2015-03-25 14:12:13 +00:00
Jason Monk
4b7b21ec83 Merge "systemui: Handle case when network has been lost" 2015-03-24 19:57:49 +00:00
Alex Klyubin
84750f3a69 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
2015-03-24 11:33:58 -07:00
Olawale Ogunwale
f5f70b66a3 Merge "[ActivityManager] Avoid killing unrelated processes." 2015-03-24 16:12:23 +00:00
Olawale Ogunwale
000293c93b Merge "Layout the window to be displayed if it would be resized" 2015-03-24 16:11:40 +00:00
Olawale Ogunwale
07520c944c Merge "DimLayer : remove unnecessary surface transaction calls" 2015-03-24 16:10:49 +00:00
Andreas Gampe
7db6ebe037 Merge "Frameworks/base: Don't allocate another identity matrix" 2015-03-24 16:02:55 +00:00
Mathias Jeppsson
a8f45e63c7 Sort Bluetooth devices in quick settings by name
To avoid Bluetooth devices moving randomly in list, sorting by name.

Change-Id: I4f8e9f98fa29f9670678a3bb6051a6fcf7ae0b9d
2015-03-24 16:11:10 +01:00
John Reck
540e1f8cbc Merge "Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'" 2015-03-24 14:44:06 +00:00
Dohyun Lee
6ce3a37f6b 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>
2015-03-24 13:31:22 +09:00
Craig Mautner
f8a2ba511e Merge "Prevent unexpected rotation while going back to keyguard" 2015-03-23 21:48:57 +00:00
Miao Wang
b2b0c4c207 Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks." 2015-03-23 21:01:59 +00:00
Miao Wang
a4e5adf955 [RenderScript] Add create(Context, int) to be compatible with
the thunker layer & minor tweaks.

bug:19888167
bug:19888339
Change-Id: Ib264c4ca48c990b3476456838047f73d95f6752f
2015-03-23 11:50:18 -07:00
Michael Wright
978cfc39a1 Merge "SystemUI needs the SET_WALLPAPER permission" 2015-03-23 15:43:23 +00:00
Samuel Asteberg
8d516a80a0 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
2015-03-23 13:50:09 +01:00
tiger_huang
1263b2f1f2 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
2015-03-23 05:58:46 +00:00
sj.cha
08bbca040f 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
2015-03-23 11:40:35 +09:00
Chad Brubaker
534bf9c268 Enforce tag types in KeymasterArgument classes
Change-Id: Ib1aca884a0b42c3e245db65d48c945b34935072d
2015-03-22 04:56:46 -07:00
Chad Brubaker
9f47709f8b Use correct tag type for RSA exponent
Change-Id: I957c4469401953d2298751c655ca8e9f95b9511d
2015-03-22 04:45:32 -07:00
Chad Brubaker
5e73c0eec2 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
2015-03-21 23:15:20 -07:00
Alan Viverette
38fcaf4037 Merge "Move arrow_pointer hotspot to better match actual tip" 2015-03-21 20:06:57 +00:00