OSDN Git Service
Rich Slogar [Mon, 30 Mar 2015 21:42:58 +0000 (21:42 +0000)]
am
400fd04f: am
b1dc614d: am
f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '
400fd04fa14309220b74fcd87d5a3eb66ab430bf':
docs: build tools 22.0.1 revision updates
Rich Slogar [Mon, 30 Mar 2015 21:37:05 +0000 (21:37 +0000)]
am
b1dc614d: am
f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '
b1dc614d151a90e8745964157f0f7bc2c145894f':
docs: build tools 22.0.1 revision updates
Rich Slogar [Mon, 30 Mar 2015 21:30:39 +0000 (21:30 +0000)]
am
f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '
f80370c60118441c0022333a5b4f8cda99c86774':
docs: build tools 22.0.1 revision updates
Rich Slogar [Mon, 30 Mar 2015 21:24:19 +0000 (21:24 +0000)]
Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
Alex Klyubin [Mon, 30 Mar 2015 20:47:15 +0000 (20:47 +0000)]
am
6a6f0c7d: Merge "Add HmacSHA256 backed by AndroidKeyStore."
* commit '
6a6f0c7de263743dc22b046dd9d53c694bce3ac5':
Add HmacSHA256 backed by AndroidKeyStore.
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:18:34 +0000 (20:18 +0000)]
am
f603e286: Merge "Add authorization binder methods"
* commit '
f603e2861430f13a746f80885b5fc00994f64391':
Add authorization binder methods
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
Geoff Mendal [Mon, 30 Mar 2015 14:49:09 +0000 (14:49 +0000)]
am
6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit '
6e6250b9613e7c236a07367fc800feece8bcd706':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 30 Mar 2015 14:38:42 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
Mathieu Chartier [Sun, 29 Mar 2015 22:42:53 +0000 (22:42 +0000)]
am
631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '
631565abd6cadd65befe197afa7bac0d44f70fb2':
Change getDeclaredFieldsUnchecked call to new return value
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 05:03:25 +0000 (05:03 +0000)]
am
a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '
a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
Frameworks/base: Change String == to equals in Preference
Andreas Gampe [Sat, 28 Mar 2015 05:03:18 +0000 (05:03 +0000)]
am
5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '
5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
Frameworks/base: Fix request removal in VoiceInteractionSession
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 23:26:08 +0000 (23:26 +0000)]
am
36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '
36ee836d2f6e6df59d6a20a69421639bacf25559':
Symmetric key generation for AndroidKeyStore.
Chad Brubaker [Fri, 27 Mar 2015 23:25:59 +0000 (23:25 +0000)]
am
dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '
dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
Allow entropy to be provided to some operations
Bart Sears [Fri, 27 Mar 2015 23:08:46 +0000 (23:08 +0000)]
am
c03cfc9d: am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
c03cfc9d86c4324464ae44b49c7ac31c9a4bba50':
CEC: Explicitly turn on screen for remote control passthrough
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
Alex Klyubin [Fri, 27 Mar 2015 21:42:08 +0000 (21:42 +0000)]
am
274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '
274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
Symmetric key import for AndroidKeyStore.
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
Bart Sears [Fri, 27 Mar 2015 21:23:01 +0000 (21:23 +0000)]
am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
d4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
CEC: Explicitly turn on screen for remote control passthrough
Bart Sears [Fri, 27 Mar 2015 21:14:37 +0000 (21:14 +0000)]
am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
4a26c391d08dfa6a3c189293f0fc163b817b1b49':
CEC: Explicitly turn on screen for remote control passthrough
Bart Sears [Fri, 27 Mar 2015 20:48:37 +0000 (20:48 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
Alex Klyubin [Fri, 27 Mar 2015 19:21:12 +0000 (19:21 +0000)]
Merge "Symmetric key import for AndroidKeyStore."
Deepanshu Gupta [Fri, 27 Mar 2015 03:05:16 +0000 (03:05 +0000)]
am
fb37c97c: am
61bb0b4f: am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
fb37c97c251cc9bef81dbf5b9acc58328656a980':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 03:05:09 +0000 (03:05 +0000)]
am
63862a20: am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
63862a2052d41db4543a6a15713f5146b76d65cc':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 02:58:47 +0000 (02:58 +0000)]
am
61bb0b4f: am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 02:58:40 +0000 (02:58 +0000)]
am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
7b73a788f0c18a31de729daa51e7e06286cf7609':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 02:49:27 +0000 (02:49 +0000)]
am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
4e6ae02a29dd432648a81f3803f3ccf712621d43':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 02:49:23 +0000 (02:49 +0000)]
am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
dbe0dd160e93feef1335830a36e86ae83b19b793':
When scanning unbundled apps, only install the expected APK tree
Jason Sams [Fri, 27 Mar 2015 01:13:26 +0000 (01:13 +0000)]
am
ee80414d: Merge "Fix doc bug for object size."
* commit '
ee80414d0ddd6a27bbf86e0de47dd86bc335431d':
Fix doc bug for object size.
Michael Runge [Fri, 27 Mar 2015 01:10:25 +0000 (01:10 +0000)]
am
0f9b7015: am
9e3976b6: am
9a91bf1d: am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
0f9b70159a07f09f34c3688cce4b30362afa1855':
Increase timeout when uncrypting OTA
Amith Yamasani [Fri, 27 Mar 2015 01:10:17 +0000 (01:10 +0000)]
am
a5c20b98: am
c704bc64: am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
a5c20b98cd1c0b18fa3d434f0ecf44cd8db155f4':
Deepanshu Gupta [Fri, 27 Mar 2015 01:10:01 +0000 (01:10 +0000)]
am
fc18e950: am
cfdd1e18: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
fc18e950bf5a05ac29e1b070b0bdfd5002903cae':
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:56 +0000 (01:09 +0000)]
am
836f5d98: am
85afc992: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
836f5d986f9dc4d6915aade059ef5ff7e584cde1':
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:53 +0000 (01:09 +0000)]
am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
17bb697b3bce1b23137553829dd62e0e7c16b472':
Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:45 +0000 (01:09 +0000)]
am
18755bfa: am
0c8ccefc: am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
18755bfa3e346c42212f235e79856de54aae2095':
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:39 +0000 (01:09 +0000)]
am
7a5a976c: am
c07448d2: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
7a5a976c9e054303ddd19a26c587c5e34368a339':
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:32 +0000 (01:09 +0000)]
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:27 +0000 (01:09 +0000)]
Jeff Brown [Fri, 27 Mar 2015 01:09:22 +0000 (01:09 +0000)]
am
a15ce03e: am
64646def: am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
a15ce03ee716be8b59965e0aeb6e6fcb23a8c237':
Deepanshu Gupta [Fri, 27 Mar 2015 01:02:58 +0000 (01:02 +0000)]
am
ec8df9af: Fix tests for Java 6.
* commit '
ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
Fix tests for Java 6.
Jason Sams [Fri, 27 Mar 2015 00:58:43 +0000 (00:58 +0000)]
Merge "Fix doc bug for object size."
Michael Runge [Fri, 27 Mar 2015 00:50:41 +0000 (00:50 +0000)]
am
9e3976b6: am
9a91bf1d: am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
9e3976b6feba28b027122af25b21c9eca6705f0f':
Increase timeout when uncrypting OTA
Amith Yamasani [Fri, 27 Mar 2015 00:50:33 +0000 (00:50 +0000)]
am
c704bc64: am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
c704bc647270c30b5c38d53d10228325befeb0b7':
Deepanshu Gupta [Fri, 27 Mar 2015 00:50:27 +0000 (00:50 +0000)]
am
cfdd1e18: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
cfdd1e18a8039b8c0b1c1f260018cac3a613c3ec':
Deepanshu Gupta [Fri, 27 Mar 2015 00:50:19 +0000 (00:50 +0000)]
am
85afc992: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
85afc992ea0058155c73b2ad06f130df7bc697f4':
Deepanshu Gupta [Fri, 27 Mar 2015 00:50:00 +0000 (00:50 +0000)]
am
0c8ccefc: am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
0c8ccefc54f4ddb2cc91df093bc09bd4ac8a1215':
Deepanshu Gupta [Fri, 27 Mar 2015 00:49:53 +0000 (00:49 +0000)]
am
c07448d2: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
c07448d22ccc802acef341684d182898b6d449b6':
Deepanshu Gupta [Fri, 27 Mar 2015 00:49:46 +0000 (00:49 +0000)]
Deepanshu Gupta [Fri, 27 Mar 2015 00:49:40 +0000 (00:49 +0000)]
am
5bbc0265: am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
5bbc026536f460c90f17f4554bad554f72df0009':
Jeff Brown [Fri, 27 Mar 2015 00:49:33 +0000 (00:49 +0000)]
am
64646def: am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
64646defa7d01ca4105a5da8cc8d0999dac1543d':
Jason Sams [Fri, 27 Mar 2015 00:39:34 +0000 (17:39 -0700)]
Fix doc bug for object size.
Change-Id: I3c810abcb9734196bd8804a22efc010dd3a73291
Michael Runge [Fri, 27 Mar 2015 00:35:12 +0000 (00:35 +0000)]
am
9a91bf1d: am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
Increase timeout when uncrypting OTA
Amith Yamasani [Fri, 27 Mar 2015 00:35:00 +0000 (00:35 +0000)]
am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
0afd1905b59446fc471680325bcbea802bb37c5c':
Fix NPE if FPE service does not exist.
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:21 +0000 (00:34 +0000)]
am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
862f5900e8abce1cc20979a4dca76e1f0b982880':
Update JRE for runConfigurations.
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:12 +0000 (00:34 +0000)]
am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
dbb38b30612dc054ba3bf066f8528cccfceb47ad':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:01 +0000 (00:34 +0000)]
am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
e97079d97a5c914d06c24cb9deda1da9bea88aeb':
Fix RoundRect radius.
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:56 +0000 (00:33 +0000)]
am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
2b98abde26aa2033562b48d635d6f2ba11c48908':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:52 +0000 (00:33 +0000)]
am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
6fa9d5546fa27665de3f64564897a77735b2a1b0':
Better shadows.
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:47 +0000 (00:33 +0000)]
am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
5bc625d83d60fbb27ab2297051971be91fb3e415':
Fix layoutlib tests.
Jeff Brown [Fri, 27 Mar 2015 00:33:21 +0000 (00:33 +0000)]
am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
d62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
Christopher Tate [Thu, 26 Mar 2015 22:38:29 +0000 (15:38 -0700)]
When scanning unbundled apps, only install the expected APK tree
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state. When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.
Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.
Bug
19602471
Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
Jason Sams [Thu, 26 Mar 2015 22:45:48 +0000 (22:45 +0000)]
am
73ffe0cc: Merge "Catch errors for unknown object types."
* commit '
73ffe0cc23dd094e720b947b4daefac90e98524b':
Catch errors for unknown object types.
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:35:04 +0000 (22:35 +0000)]
am
22580b83: Merge "Fix potential npe"
* commit '
22580b83f18b572707ea47f99cb9016f067b89f8':
Fix potential npe
Robert Greenwalt [Thu, 26 Mar 2015 22:34:56 +0000 (22:34 +0000)]
am
727cac07: Merge "Add getLegacyVpnInfoPrivileged method"
* commit '
727cac07cc823f4a21be420aa33da6369b390c54':
Add getLegacyVpnInfoPrivileged method
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
Deepanshu Gupta [Thu, 26 Mar 2015 18:08:43 +0000 (11:08 -0700)]
Fix tests for Java 6.
- Change the guava version used to match the one included in the SDK.
The test server uses the same. However, the command line build still
uses the guava present at platform/external/guava, which is compiled
with Java 7. Thus, running the tests from inside the IDE can be done
via Java 6.
- Rebuilt the test app classes with Java 6 compatibility.
- Change similarity threshold to prevent differences due to some locale
settings different java versions.
Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
Michael Runge [Thu, 26 Mar 2015 04:08:24 +0000 (04:08 +0000)]
am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 03:57:33 +0000 (03:57 +0000)]
am
b0197033: Increase timeout when uncrypting OTA
* commit '
b019703395ae0304ddd10054843c64db87229d23':
Increase timeout when uncrypting OTA
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug:
18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit
01c06dfb076b71cb72c4bff9175bec9d59d2efde)
Jinsuk Kim [Tue, 24 Mar 2015 07:55:01 +0000 (16:55 +0900)]
CEC: Explicitly turn on screen for remote control passthrough
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.
Bug:
19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit
9b8507c52ae845c8eed9fd9952bf66538934b8fd)
Filip Gruszczynski [Wed, 25 Mar 2015 22:43:02 +0000 (22:43 +0000)]
am
9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev
* commit '
9001f14b205aba4d9fa236611b122492b92d3b4a':
Don't use windowOutsetBottom for insets, depend on display padding only.
Filip Gruszczynski [Wed, 25 Mar 2015 22:37:36 +0000 (22:37 +0000)]
Merge "Don't use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev
Amith Yamasani [Wed, 25 Mar 2015 22:25:51 +0000 (22:25 +0000)]
am
eedf2fe0: am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
eedf2fe04a94c13c4548082a3675c6888293ef4e':
Fix NPE if FPE service does not exist.
Amith Yamasani [Wed, 25 Mar 2015 22:19:20 +0000 (22:19 +0000)]
am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
0afd1905b59446fc471680325bcbea802bb37c5c':
Fix NPE if FPE service does not exist.
Amith Yamasani [Wed, 25 Mar 2015 22:12:44 +0000 (22:12 +0000)]
Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Bryce Lee [Wed, 25 Mar 2015 20:33:53 +0000 (20:33 +0000)]
am
5f11a1af: add correct exception throw declaration to isScreenBrightnessBoosted.
* commit '
5f11a1af572730567d9e35d6792a720585a268c6':
add correct exception throw declaration to isScreenBrightnessBoosted.
Alan Viverette [Wed, 25 Mar 2015 20:18:37 +0000 (20:18 +0000)]
am
5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery"
* commit '
5fc9b336ebb6fc224b3e77af388024dea029fbb3':
Consider RTL layout in DPAD navigation in Gallery
Chad Brubaker [Wed, 25 Mar 2015 20:12:55 +0000 (20:12 +0000)]
am
704aa5ae: Merge "Use correct tag type for RSA exponent"
* commit '
704aa5ae48b5c0ff3e330aba9611723840396fdb':
Use correct tag type for RSA exponent
Chad Brubaker [Wed, 25 Mar 2015 20:12:49 +0000 (20:12 +0000)]
am
6326f964: Merge "Make application/client id an object"
* commit '
6326f964769c603382ee6694b33954b4ff9b9a52':
Make application/client id an object
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 19:03:34 +0000 (19:03 +0000)]
am
a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one."
* commit '
a9f628662c348c5926caf5e2df0fd2f245a715bf':
Framework's NetworkSecurityPolicy delegates to libcore's one.
Chad Brubaker [Wed, 25 Mar 2015 19:03:28 +0000 (19:03 +0000)]
am
5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"
* commit '
5aeb085389954a32e1ea2189b7bec8080b0226c5':
Enforce tag types in KeymasterArgument classes
Alan Viverette [Wed, 25 Mar 2015 19:03:21 +0000 (19:03 +0000)]
am
7506f499: Merge "Fix to crash when clicking text link without view activity"
* commit '
7506f499b523d05c6bca5acb6d83f55820d33771':
Fix to crash when clicking text link without view activity
Bryce Lee [Wed, 25 Mar 2015 18:51:39 +0000 (11:51 -0700)]
add correct exception throw declaration to isScreenBrightnessBoosted.
Change-Id: I9b861002d7719ad43643d68f6795df6938bd0fc3
Bryce Lee [Wed, 25 Mar 2015 18:51:05 +0000 (18:51 +0000)]
am
40a4f4a6: Implement isScreenBrightnessBoosted in BridgePowerManager.
* commit '
40a4f4a61fbb2172901eda763bf928ae9b1b5300':
Implement isScreenBrightnessBoosted in BridgePowerManager.
OSDN Git Service
