OSDN Git Service
Alex Klyubin [Sat, 11 Apr 2015 02:35:45 +0000 (02:35 +0000)]
am
c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."
* commit '
c1c6528d2b686d5a17e577e7864a319dcba7c224':
Add EcIesParameterSpec to enable ECIES crypto.
Alex Klyubin [Sat, 11 Apr 2015 02:17:00 +0000 (02:17 +0000)]
Merge "Add EcIesParameterSpec to enable ECIES crypto."
David Friedman [Sat, 11 Apr 2015 02:15:48 +0000 (02:15 +0000)]
am
23b5e508: am
340a617e: am
746fed63: am
3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '
23b5e508adfb454552fda16d76d65b070a53f759':
New build rule reflecting different masthead, side nav for NDK minisite.
David Friedman [Sat, 11 Apr 2015 02:05:57 +0000 (02:05 +0000)]
am
340a617e: am
746fed63: am
3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '
340a617ef42951446bbc730833cea207370307d0':
New build rule reflecting different masthead, side nav for NDK minisite.
David Friedman [Sat, 11 Apr 2015 01:55:32 +0000 (01:55 +0000)]
am
746fed63: am
3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '
746fed63567c548c7b55c14e1532d059753bfa52':
New build rule reflecting different masthead, side nav for NDK minisite.
David Friedman [Sat, 11 Apr 2015 01:46:19 +0000 (01:46 +0000)]
am
3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
* commit '
3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
New build rule reflecting different masthead, side nav for NDK minisite.
David Friedman [Sat, 11 Apr 2015 01:36:56 +0000 (01:36 +0000)]
Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs
Chad Brubaker [Fri, 10 Apr 2015 22:09:18 +0000 (22:09 +0000)]
am
386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth"
* commit '
386c4e9ea976377d87950427472a593c22b1b205':
Fix testSaw_ungrantedUid_Bluetooth
Alex Klyubin [Fri, 10 Apr 2015 17:20:48 +0000 (10:20 -0700)]
Add EcIesParameterSpec to enable ECIES crypto.
Bug:
18088752
Change-Id: I597b019106c500188e0fbbc9608722668c08b421
Shawn Willden [Fri, 10 Apr 2015 21:51:22 +0000 (21:51 +0000)]
am
97fce66f: Merge "Make several key crypto parameters repeatable"
* commit '
97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f':
Make several key crypto parameters repeatable
Chad Brubaker [Fri, 10 Apr 2015 21:42:23 +0000 (21:42 +0000)]
Merge "Fix testSaw_ungrantedUid_Bluetooth"
Shawn Willden [Fri, 10 Apr 2015 21:21:36 +0000 (21:21 +0000)]
Merge "Make several key crypto parameters repeatable"
Chad Brubaker [Fri, 10 Apr 2015 21:15:01 +0000 (14:15 -0700)]
Fix testSaw_ungrantedUid_Bluetooth
Keystore.saw returns [] on no result, not null, so the test was
incorrectly failing.
Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
Olawale Ogunwale [Fri, 10 Apr 2015 20:37:00 +0000 (20:37 +0000)]
am
4406568e: Merge "Check caller status precisely when registering receiver."
* commit '
4406568ebac6f6bbf627aeb6909b409d948cecf4':
Check caller status precisely when registering receiver.
Olawale Ogunwale [Fri, 10 Apr 2015 20:14:52 +0000 (20:14 +0000)]
Merge "Check caller status precisely when registering receiver."
Bryce Lee [Fri, 10 Apr 2015 19:51:32 +0000 (19:51 +0000)]
am
eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
* commit '
eccaf7290ab833d12049a184747603cd74261490':
Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
Chad Brubaker [Thu, 5 Mar 2015 22:46:16 +0000 (14:46 -0800)]
Make several key crypto parameters repeatable
Bug:
19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
Alex Klyubin [Fri, 10 Apr 2015 18:09:27 +0000 (18:09 +0000)]
am
a270264c: Merge "Track more changes to keymaster_defs.h"
* commit '
a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
Track more changes to keymaster_defs.h
Alex Klyubin [Fri, 10 Apr 2015 17:51:44 +0000 (17:51 +0000)]
Merge "Track more changes to keymaster_defs.h"
Nick Kralevich [Fri, 10 Apr 2015 16:31:23 +0000 (16:31 +0000)]
am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
08d76a946b898af28f3c8125cdf4966195b718fb':
Impose an ordering on created SELinuxMMAC Policy objects.
Nick Kralevich [Fri, 10 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Impose an ordering on created SELinuxMMAC Policy objects."
Alex Klyubin [Fri, 10 Apr 2015 02:59:00 +0000 (19:59 -0700)]
Track more changes to keymaster_defs.h
KeyStoreTest needed to be adjusted because OCB is no longer supported.
Bug:
18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
John Reck [Fri, 10 Apr 2015 15:44:34 +0000 (15:44 +0000)]
am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
a08f6a66e91c7bacd50e64c039aaaa6b9fe2625c':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 15:44:26 +0000 (15:44 +0000)]
am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
d56e087b550f7ee351f15ac6c5ff9d57a08387fc':
Fixing memory leak in RenderBufferCache
riddle_hsu [Wed, 4 Feb 2015 12:52:03 +0000 (20:52 +0800)]
Check caller status precisely when registering receiver.
Fine tune commit
9ac9609f.
Because process may reuse same process record to restart.
It is better to check below conditions to skip:
1. Simple dead and has been cleaned.
=> .thread will be null
2.The process has restarted with new pid but has not attached yet.
=> .thread will be null
3.The process has restarted and attached.
=> The IBinder will be different
Change-Id: Ic052f5025558ca93e1a6ab11bca61fe995126bb9
John Reck [Fri, 10 Apr 2015 15:32:00 +0000 (15:32 +0000)]
Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
John Reck [Fri, 10 Apr 2015 15:27:01 +0000 (15:27 +0000)]
Merge "Fixing memory leak in RenderBufferCache"
Robert Craig [Fri, 10 Apr 2015 15:02:33 +0000 (11:02 -0400)]
Impose an ordering on created SELinuxMMAC Policy objects.
Imposing an order on Policy objects allows us to extend the
policy writers ability to union mac_permissions.xml files.
Policy developers can now create new mac_permissions.xml
entries under their device specific directories. This is
in contrast to current methods which only allow differing
stanzas to appear outside the base mac_permissions.xml.
Also, report on stanzas with duplicate input selectors and
treat these as errors. There are some ambiguities that can
arise otherwise.
Lastly, impose an XOR condition on signer stanzas w.r.t seinfo
and package tags. This finer distinction helps the union feature
of policy to become clearer and simpler to code.
Change-Id: Idd86df8ad9a63d1b8ba6e8270670814ca6cee8d2
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Tim Murray [Fri, 10 Apr 2015 01:07:26 +0000 (01:07 +0000)]
am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
6d718c2f43f6be057f9a519bc02f6b123405b79d':
Add support for setting the cache directory.
Tim Murray [Fri, 10 Apr 2015 00:51:14 +0000 (00:51 +0000)]
Merge "Add support for setting the cache directory."
Tim Murray [Tue, 7 Apr 2015 22:43:24 +0000 (15:43 -0700)]
Add support for setting the cache directory.
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
Alex Klyubin [Fri, 10 Apr 2015 00:22:45 +0000 (00:22 +0000)]
am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
Track recent keymaster_defs.h changes.
Alex Klyubin [Fri, 10 Apr 2015 00:01:18 +0000 (00:01 +0000)]
Merge "Track recent keymaster_defs.h changes."
Alex Klyubin [Thu, 9 Apr 2015 23:58:58 +0000 (16:58 -0700)]
Track recent keymaster_defs.h changes.
Bug:
18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
Alex Klyubin [Thu, 9 Apr 2015 23:55:47 +0000 (23:55 +0000)]
am
c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
* commit '
c6eb62882b09cf06e1e70c14e7878593d1a76477':
Split key origin into TEE/not and generated/imported.
Mathieu Chartier [Thu, 9 Apr 2015 23:36:06 +0000 (23:36 +0000)]
am
da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
* commit '
da164973f35aa32e44d0b9336deef28df5b13544':
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Alex Klyubin [Thu, 9 Apr 2015 23:34:44 +0000 (23:34 +0000)]
Merge "Split key origin into TEE/not and generated/imported."
Mathieu Chartier [Thu, 9 Apr 2015 23:14:27 +0000 (23:14 +0000)]
Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
Mathieu Chartier [Thu, 9 Apr 2015 21:32:31 +0000 (14:32 -0700)]
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Example output of "adb shell dumpsys meminfo -d":
Total PSS by category:
193605 kB: Dalvik
87561 kB: .Heap
77863 kB: .LOS
15333 kB: .Zygote
12848 kB: .NonMoving
6770 kB: .GC
2597 kB: .LinearAlloc
1180 kB: .JITCache
1180 kB: .IndirectRef
103936 kB: EGL mtrack
101827 kB: Native
Bug:
17643507
(cherry picked from commit
546edc5a31bb5a843048e11d8afb0b1f6441ddb4)
Change-Id: If34627cf93ba5305b428d2278f350a2649d63d5e
Alex Klyubin [Thu, 9 Apr 2015 22:50:17 +0000 (15:50 -0700)]
Split key origin into TEE/not and generated/imported.
This is to match the upcoming changes in Keymaster HAL API.
Bug:
18088752
Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db
Jeff Sharkey [Thu, 9 Apr 2015 21:57:41 +0000 (21:57 +0000)]
am
1d3c77a2: Merge "Start passing volume UUID to installd."
* commit '
1d3c77a21e9c8fc59200b42503d9f0effd3f1551':
Start passing volume UUID to installd.
Alex Klyubin [Thu, 9 Apr 2015 21:57:35 +0000 (21:57 +0000)]
am
97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '
97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
Fix minor issues in new Javadocs of AndroidKeyStore.
Jeff Sharkey [Thu, 9 Apr 2015 21:41:11 +0000 (21:41 +0000)]
Merge "Start passing volume UUID to installd."
Alex Klyubin [Thu, 9 Apr 2015 21:40:58 +0000 (21:40 +0000)]
Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
Alex Klyubin [Thu, 9 Apr 2015 21:33:11 +0000 (14:33 -0700)]
Fix minor issues in new Javadocs of AndroidKeyStore.
Bug:
18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
Jeff Sharkey [Thu, 9 Apr 2015 20:18:44 +0000 (13:18 -0700)]
Start passing volume UUID to installd.
This change adds new method overloads to provide volume UUID. The
older methods remain for now, and pass through the "null" UUID to
reference internal storage.
Follows the existing pattern where null arguments are passed as "!".
Bug:
19993667
Change-Id: Ia1b7c8550cabc13e4f6e1182eabb650f2c33e44f
Alex Klyubin [Thu, 9 Apr 2015 20:15:02 +0000 (20:15 +0000)]
am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
aeae0f384f72d4deca698697b125b82b322f7f90':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:14:56 +0000 (20:14 +0000)]
am
8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '
8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
Add missing mapping between JCA and keystore HMAC names.
Bryce Lee [Thu, 9 Apr 2015 20:10:33 +0000 (13:10 -0700)]
Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with
keyguard enabled.
Bug:
20037090
Change-Id: I613f3278a234e3961cb4be1976da0f821aebfc1f
Alex Klyubin [Thu, 9 Apr 2015 20:02:39 +0000 (20:02 +0000)]
Merge "Add asymmetric crypto constants for AndroidKeyStore API."
Alex Klyubin [Thu, 9 Apr 2015 19:57:12 +0000 (19:57 +0000)]
Merge "Add missing mapping between JCA and keystore HMAC names."
Alex Klyubin [Thu, 9 Apr 2015 18:38:44 +0000 (11:38 -0700)]
Add asymmetric crypto constants for AndroidKeyStore API.
Bug:
18088752
Change-Id: Iee72a4c230f3a2cd30d9eb4d29c4301f3e113f31
Dan Albert [Thu, 9 Apr 2015 18:26:34 +0000 (18:26 +0000)]
am
d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit '
d9f32b164be11b6c42ee36ca6945623073e82c99':
Ensure alignment of Res_png_9patch.
Rich Slogar [Thu, 9 Apr 2015 18:21:06 +0000 (18:21 +0000)]
am
0b1610ff: am
2489a7fd: am
9d6e9587: am
36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '
0b1610ff49b042df19fc9071f2811efb642f7df9':
docs: remove studio proguard settings from play services
Rich Slogar [Thu, 9 Apr 2015 18:11:24 +0000 (18:11 +0000)]
am
2489a7fd: am
9d6e9587: am
36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '
2489a7fd5fbafde339ac58f2f1e7a5854e7e4936':
docs: remove studio proguard settings from play services
Dan Albert [Thu, 9 Apr 2015 18:09:09 +0000 (18:09 +0000)]
Merge "Ensure alignment of Res_png_9patch."
Rich Slogar [Thu, 9 Apr 2015 17:57:20 +0000 (17:57 +0000)]
am
9d6e9587: am
36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '
9d6e95879aff4608db400c270fa8f89b6b55d0e6':
docs: remove studio proguard settings from play services
Rich Slogar [Thu, 9 Apr 2015 17:47:40 +0000 (17:47 +0000)]
am
36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '
36e3f5125895875c63242294da289ca4b09c9f9e':
docs: remove studio proguard settings from play services
Dan Albert [Wed, 8 Apr 2015 01:38:42 +0000 (18:38 -0700)]
Ensure alignment of Res_png_9patch.
This doesn't alter the alignment of the data within the struct, but
enforces that this structure will be appropriately aligned when used.
The image_info struct has this struct preceded by a bool, which causes
odd alignment for the members of this struct.
Change-Id: Ia2ef5c81b2f961c0f61858a10a7821d82f600919
Rich Slogar [Thu, 9 Apr 2015 17:39:28 +0000 (17:39 +0000)]
Merge "docs: remove studio proguard settings from play services" into lmp-docs
Alex Klyubin [Thu, 9 Apr 2015 17:10:57 +0000 (17:10 +0000)]
am
e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
* commit '
e26347bb740f5d1bcf51036e63c1b1c91e685f4c':
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
Alex Klyubin [Thu, 9 Apr 2015 16:28:38 +0000 (09:28 -0700)]
Add missing mapping between JCA and keystore HMAC names.
This is a follow-up to
70376a77280551791dae62586a6bb0c77ed9429a where
I forgot to update this mapping.
Bug:
18088752
Change-Id: I322a9abd642ddee3bd2b4f49379b121012e32836
Alex Klyubin [Thu, 9 Apr 2015 16:51:02 +0000 (16:51 +0000)]
Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
Alex Klyubin [Thu, 9 Apr 2015 16:42:09 +0000 (09:42 -0700)]
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
This wasn't meant to be public API yet.
Bug:
18088752
Change-Id: I40e57fd9121348086ae88ad9fa54f930547b77ba
Alex Klyubin [Thu, 9 Apr 2015 16:30:50 +0000 (16:30 +0000)]
am
a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys."
* commit '
a482b0469cb98a5743603e1602aa6f37c65d1659':
Require IND-CPA by default for new AndroidKeyStore keys.
Alex Klyubin [Thu, 9 Apr 2015 16:12:08 +0000 (16:12 +0000)]
Merge "Require IND-CPA by default for new AndroidKeyStore keys."
Richard Uhler [Thu, 9 Apr 2015 14:31:10 +0000 (14:31 +0000)]
am
f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat."
* commit '
f324d245fdd07ac14ab312d1a5fa04a4e8dfcceb':
Reuse dexopt method for both dex2oat and patchoat.
Richard Uhler [Thu, 9 Apr 2015 14:13:26 +0000 (14:13 +0000)]
Merge "Reuse dexopt method for both dex2oat and patchoat."
Colin Cross [Thu, 9 Apr 2015 01:13:50 +0000 (01:13 +0000)]
am
1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"
* commit '
1be312dfb02e86731da6ac54a39956db791f4978':
Re-enable -Wall and -Werror that were lost in a merge
Colin Cross [Thu, 9 Apr 2015 00:49:55 +0000 (00:49 +0000)]
Merge "Re-enable -Wall and -Werror that were lost in a merge"
Colin Cross [Thu, 9 Apr 2015 00:29:00 +0000 (17:29 -0700)]
Re-enable -Wall and -Werror that were lost in a merge
-Wall and -Werror were lost during a merge when they were added to
aaptCFLAGS instead of aaptCFlags. Fix the typo, and the warnings
that crept in while it was disabled.
Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
Olawale Ogunwale [Thu, 9 Apr 2015 00:32:45 +0000 (00:32 +0000)]
am
e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit '
e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e':
Prevent windows from freezing screen while timeout
Alex Klyubin [Thu, 9 Apr 2015 00:32:38 +0000 (00:32 +0000)]
am
1da3d7fc: Merge "Add more digests to AndroidKeyStore API."
* commit '
1da3d7fcf33fd61f0143f8a410f0a77783fe1bfe':
Add more digests to AndroidKeyStore API.
Alex Klyubin [Wed, 8 Apr 2015 20:36:22 +0000 (13:36 -0700)]
Require IND-CPA by default for new AndroidKeyStore keys.
Bug:
18088752
Change-Id: I01e44b7155df4326b5c9d83dda57f889c1f23ec7
Olawale Ogunwale [Wed, 8 Apr 2015 21:56:09 +0000 (21:56 +0000)]
Merge "Prevent windows from freezing screen while timeout"
Alex Klyubin [Wed, 8 Apr 2015 21:37:26 +0000 (21:37 +0000)]
Alex Klyubin [Wed, 8 Apr 2015 21:37:11 +0000 (21:37 +0000)]
am
edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore."
* commit '
edd0e6c09820b08f22937bbbc00149adc6d66f07':
Refuse to reuse IV in encryption mode in AndroidKeyStore.
Alex Klyubin [Wed, 8 Apr 2015 21:37:04 +0000 (21:37 +0000)]
am
3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."
* commit '
3283d2d208c0686fa964008e1520179948886adb':
Add BlockMode.GCM constant to AndroidKeyStore API.
Alex Klyubin [Wed, 8 Apr 2015 21:32:08 +0000 (21:32 +0000)]
Merge "Add more digests to AndroidKeyStore API."
Alex Klyubin [Wed, 8 Apr 2015 21:15:57 +0000 (14:15 -0700)]
Add more digests to AndroidKeyStore API.
This adds MD5, SHA-1, SHA-224, SHA-384, and SHA-512. SHA-256 was
already there.
MD5 is not exposed for HMAC on purpose, because MD5 has been
deprecated for years.
Bug:
18088752
Change-Id: I4df3d3f6cf10805c7910a1bdb577a91c85055945
Quddus Chong [Wed, 8 Apr 2015 18:59:37 +0000 (18:59 +0000)]
am
67f0c8db: am
a147451a: am
c61fd055: am
ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs
* commit '
67f0c8db35be1c43b3f588e3414557749a277e6f':
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
Quddus Chong [Wed, 8 Apr 2015 18:48:57 +0000 (18:48 +0000)]
am
a147451a: am
c61fd055: am
ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs
* commit '
a147451ab92e29141cd85d5c75a881586d5959df':
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
Quddus Chong [Wed, 8 Apr 2015 18:38:47 +0000 (18:38 +0000)]
am
c61fd055: am
ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs
* commit '
c61fd05581a80bcecf50509acb220ea3e2817e56':
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
Quddus Chong [Wed, 8 Apr 2015 18:27:56 +0000 (18:27 +0000)]
am
ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs
* commit '
ff4c632592cce177997d63b3ff81c0b2be9cf9bb':
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
Quddus Chong [Wed, 8 Apr 2015 18:23:52 +0000 (18:23 +0000)]
am
0c5752be: am
c736e8cf: am
f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873" into lmp-mr1-dev
* commit '
0c5752be40a9e7ced5be2659965f3c4ba3c3f4eb':
Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873
Quddus Chong [Wed, 8 Apr 2015 18:16:56 +0000 (18:16 +0000)]
Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs
Alex Klyubin [Wed, 8 Apr 2015 18:16:36 +0000 (18:16 +0000)]
Merge "Fix typo"
Quddus Chong [Wed, 8 Apr 2015 18:11:55 +0000 (18:11 +0000)]
am
c736e8cf: am
f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873" into lmp-mr1-dev
* commit '
c736e8cf41445e7a32721da617d6d7eacd189703':
Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873
Alex Klyubin [Wed, 8 Apr 2015 18:08:37 +0000 (11:08 -0700)]
Fix typo
Change-Id: I1c47ade98ad3ae41dc55e7bcafcad6901b559c89
Alex Klyubin [Wed, 8 Apr 2015 18:04:38 +0000 (18:04 +0000)]
Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore."
Quddus Chong [Tue, 7 Apr 2015 20:03:29 +0000 (13:03 -0700)]
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description.
bug:
19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
Change-Id: I48d1e2f8e1f7d94dffac61a274f9c1a2df31a822
Quddus Chong [Wed, 8 Apr 2015 17:53:44 +0000 (17:53 +0000)]
am
f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873" into lmp-mr1-dev
* commit '
f0ab39c10b614514ba4a600aa6fd4354253cde73':
Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873
Alex Klyubin [Wed, 8 Apr 2015 17:51:12 +0000 (17:51 +0000)]
Merge "Add BlockMode.GCM constant to AndroidKeyStore API."
Quddus Chong [Wed, 8 Apr 2015 17:46:20 +0000 (17:46 +0000)]
Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug:
19711873" into lmp-mr1-dev
Alex Klyubin [Wed, 8 Apr 2015 16:42:16 +0000 (09:42 -0700)]
Refuse to reuse IV in encryption mode in AndroidKeyStore.
This makes IV-using Cipher implementations backed by AndroidKeyStore
refuse to be reused. After Cipher.doFinal completes, invoking update
or doFinal will raise an exception. This is to make it harder to
violate the security best practice of not reusing IV in encryption
mode.
Bug:
18088752
Change-Id: I5102f9e8b2ff428254294703e48948ea8576603d
Olawale Ogunwale [Wed, 8 Apr 2015 16:28:52 +0000 (16:28 +0000)]
am
393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"
* commit '
393f89f26df724a3da7a21b28925a21fe5fb253f':
[ActivityManager] Avoid NullPointerException if no crash info
tiger_huang [Tue, 7 Apr 2015 09:35:13 +0000 (17:35 +0800)]
Prevent windows from freezing screen while timeout
The original logic lets windows be able to freeze screen again (by
setting win.mOrientationChanging=true) after WINDOW_FREEZE_TIMEOUT is
triggered before mInnerFields.mOrientationChangeComplete is set to
true. In this case, we would lose the protection of
WINDOW_FREEZE_TIMEOUT. If the app never finishes drawing the window,
the screen would keep freezing that the user cannot operate the
device.
Change-Id: I45a0a9e4b3f8d5b0b0043229bfa4890236ae8ab2
Olawale Ogunwale [Wed, 8 Apr 2015 16:07:44 +0000 (16:07 +0000)]
Merge "[ActivityManager] Avoid NullPointerException if no crash info"
Olawale Ogunwale [Wed, 8 Apr 2015 13:09:42 +0000 (13:09 +0000)]
am
1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"
* commit '
1bdbce295cd7978e50b5444420ed222ec6c6281c':
[ActivityManager] Finish the failed-to-pause activity
Olawale Ogunwale [Wed, 8 Apr 2015 12:51:11 +0000 (12:51 +0000)]
Merge "[ActivityManager] Finish the failed-to-pause activity"