OSDN Git Service
Jaekyun Seok [Thu, 5 Apr 2018 01:55:57 +0000 (18:55 -0700)]
Merge "Load static RROs in OverlayManagerService" into pi-dev
am:
743d42d299
Change-Id: I151823d6aa87f98d096f85119feb9b810ab62e2f
TreeHugger Robot [Thu, 5 Apr 2018 01:41:39 +0000 (01:41 +0000)]
Merge "Load static RROs in OverlayManagerService" into pi-dev
Allen Webb [Thu, 5 Apr 2018 01:13:06 +0000 (18:13 -0700)]
Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
am:
aa5c335a60
Change-Id: Ib60b57350bd8447b9b4d7bb4b56e3f5b7aadf857
Yu-Han Yang [Thu, 5 Apr 2018 01:07:21 +0000 (18:07 -0700)]
Merge "Add NtpTimeHelper" into pi-dev
am:
93a10eb1d2
Change-Id: I06ec09f1976e91e5efcb00ca5062be67e20b35b1
TreeHugger Robot [Thu, 5 Apr 2018 00:58:18 +0000 (00:58 +0000)]
Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
Android Build Merger (Role) [Thu, 5 Apr 2018 00:58:10 +0000 (00:58 +0000)]
Merge "Merge "Remove duplicate definitions of utility variables" am:
8d5a39ac62 am:
9473e846e5" into pi-dev-plus-aosp
Lucas Dupin [Thu, 5 Apr 2018 00:57:47 +0000 (17:57 -0700)]
Merge "Shelf horizontal alignment was a few dps off" into pi-dev
am:
f6486683fa
Change-Id: I3c3752cf60ae3a5a5bbe3e8d4f947081da8671f7
Dan Willemsen [Thu, 5 Apr 2018 00:56:57 +0000 (17:56 -0700)]
Merge "Remove duplicate definitions of utility variables" am:
8d5a39ac62
am:
9473e846e5
Change-Id: Ie52855316907746a6347fcc6b343f5c75d9c9c64
Winson Chung [Thu, 5 Apr 2018 00:52:31 +0000 (17:52 -0700)]
Merge "Fix app switch regression" into pi-dev
am:
1ecd7aa188
Change-Id: Ia326259ea6a41cb32362d3f60db746216faca2d1
Yu-Han Yang [Thu, 5 Apr 2018 00:51:32 +0000 (00:51 +0000)]
Merge "Add NtpTimeHelper" into pi-dev
Dan Willemsen [Thu, 5 Apr 2018 00:46:12 +0000 (17:46 -0700)]
Merge "Remove duplicate definitions of utility variables"
am:
8d5a39ac62
Change-Id: I38a6dff84d3ccad0a1b895a4416b14e59c406953
Adrian Roos [Thu, 5 Apr 2018 00:46:10 +0000 (17:46 -0700)]
Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev
am:
71c632367a
Change-Id: Ib27bd64528218cf826a3a674efad863e3cdc6555
Bill Yi [Thu, 5 Apr 2018 00:36:26 +0000 (17:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
0df72e4065 -s ours
Change-Id: Ia1a574e12e57f2a2bc4eeb80fc443278f4b12bc3
Ryan Mitchell [Thu, 5 Apr 2018 00:34:32 +0000 (17:34 -0700)]
Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev
am:
6a23deef5d
Change-Id: Iec9bec5ba7f58c5ef5ef283bac16e2a1d6ebee6d
Lucas Dupin [Thu, 5 Apr 2018 00:33:45 +0000 (00:33 +0000)]
Merge "Shelf horizontal alignment was a few dps off" into pi-dev
Winson Chung [Thu, 5 Apr 2018 00:33:07 +0000 (00:33 +0000)]
Merge "Fix app switch regression" into pi-dev
Matthew Ng [Thu, 5 Apr 2018 00:30:01 +0000 (17:30 -0700)]
Merge "Puts back res id to correct view for the pinning tutorial" into pi-dev
am:
1d513fc5d0
Change-Id: I1479abf7c8a139060c0780e138726ad02e6d5d8f
TreeHugger Robot [Thu, 5 Apr 2018 00:25:34 +0000 (00:25 +0000)]
Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 00:16:29 +0000 (00:16 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Ryan Mitchell [Thu, 5 Apr 2018 00:14:38 +0000 (00:14 +0000)]
Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 00:11:21 +0000 (00:11 +0000)]
Merge "Puts back res id to correct view for the pinning tutorial" into pi-dev
Siarhei Vishniakou [Thu, 5 Apr 2018 00:09:17 +0000 (17:09 -0700)]
Merge "Add Polish keycharactermap" am:
3b5016598d
am:
f9d6ac81a4
Change-Id: If8bd6fa07b8b7bef2e97541a9a41ff9269fd649f
Hansong Zhang [Thu, 5 Apr 2018 00:03:26 +0000 (17:03 -0700)]
Merge "Hearing Aid: change get/set active device (3/3)" am:
a23007dd54
am:
29e1c0e494
Change-Id: I62e456026531bc8921990c713595907f6f48fcf4
Jean-Michel Trivi [Wed, 4 Apr 2018 23:57:17 +0000 (16:57 -0700)]
Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev
am:
57e4156ee3
Change-Id: Ic0c6ef0355ed2d07d7810ddc800f926bfec77f81
Siarhei Vishniakou [Wed, 4 Apr 2018 23:56:02 +0000 (16:56 -0700)]
Merge "Add Polish keycharactermap"
am:
3b5016598d
Change-Id: I554316c67876f27c8a55c351d7192eea4bb1c524
Todd Kennedy [Wed, 4 Apr 2018 23:52:40 +0000 (16:52 -0700)]
Merge "Completely fill in permission info" into pi-dev
am:
fdc891e2af
Change-Id: Iff6c239001686f523bbb89aeeeae572fab32bce0
Hansong Zhang [Wed, 4 Apr 2018 23:50:40 +0000 (16:50 -0700)]
Merge "Hearing Aid: change get/set active device (3/3)"
am:
a23007dd54
Change-Id: I0760912dd11edf7f3db443d663644b0ceb415f0e
Jean-Michel Trivi [Wed, 4 Apr 2018 23:40:35 +0000 (23:40 +0000)]
Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 23:39:39 +0000 (23:39 +0000)]
Merge "Completely fill in permission info" into pi-dev
Sunny Goyal [Wed, 4 Apr 2018 23:26:38 +0000 (16:26 -0700)]
Merge "Adding a utility method to show Assist session" into pi-dev
am:
53a77b615c
Change-Id: If3e72ce3887792e85a13f138de7c21991bfc635c
Lucas Dupin [Wed, 4 Apr 2018 23:14:40 +0000 (16:14 -0700)]
Merge "Allow double tap when pulsing" into pi-dev
am:
f6f68802c9
Change-Id: I54ab15e11085b57aebba651d3c7e4ee18836758c
Suprabh Shukla [Wed, 4 Apr 2018 23:08:37 +0000 (16:08 -0700)]
Merge "Hiding windows for suspended packages" into pi-dev
am:
fe99686d8a
Change-Id: I5b8d2cf4fc1b4e5bcccf85b2411a8deefe0ee7dc
TreeHugger Robot [Wed, 4 Apr 2018 23:05:41 +0000 (23:05 +0000)]
Merge "Adding a utility method to show Assist session" into pi-dev
Treehugger Robot [Wed, 4 Apr 2018 23:04:08 +0000 (23:04 +0000)]
Merge "Remove duplicate definitions of utility variables"
Bill Yi [Wed, 4 Apr 2018 23:00:04 +0000 (16:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I32c2b02c473f73f279bea8631709bab73090d1c2
Jeff Gaston [Wed, 4 Apr 2018 22:58:05 +0000 (15:58 -0700)]
Merge "Update for sdk drop" into pi-dev
am:
71436c639a
Change-Id: I4485b4e775ff34ed383428f9f96de114c36c824f
Jaekyun Seok [Wed, 4 Apr 2018 02:28:21 +0000 (11:28 +0900)]
Load static RROs in OverlayManagerService
Only RROs targeting "android" are loaded from AssetManager, and so
others should be loaded from OverlayManagerService.
The RROs targeting "android" would be ingored as they are to avoid
redundant loading.
Bug:
76205654
Test: succeeded building and tested with taimen
Change-Id: Ibeeb3c3f3338a845b2f4c485305636003d9dbd44
TreeHugger Robot [Wed, 4 Apr 2018 22:48:22 +0000 (22:48 +0000)]
Merge "Allow double tap when pulsing" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:42:37 +0000 (22:42 +0000)]
Merge "Hiding windows for suspended packages" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:40:27 +0000 (22:40 +0000)]
Merge "Update for sdk drop" into pi-dev
Dake Gu [Wed, 4 Apr 2018 22:32:21 +0000 (15:32 -0700)]
Merge "autofill: fix window location in splitwindow and dialog" into pi-dev
am:
2b26f83f12
Change-Id: I9cc1549f891bed04a5e367b19466769be35762ba
Yangster-mac [Wed, 4 Apr 2018 22:27:09 +0000 (15:27 -0700)]
Merge "Statsd config TTL" into pi-dev
am:
48920ab48d
Change-Id: I2b06fd144ed95ff2dc1df09a906b073d856a063d
Makoto Onuki [Wed, 4 Apr 2018 22:16:16 +0000 (15:16 -0700)]
Merge "Add basic inversion lock detection to DPMS." into pi-dev
am:
d421e0ffdf
Change-Id: I480e170a69a5c194004b0d3746ff930da82dde59
Treehugger Robot [Wed, 4 Apr 2018 22:10:19 +0000 (22:10 +0000)]
Merge "Add Polish keycharactermap"
TreeHugger Robot [Wed, 4 Apr 2018 22:06:49 +0000 (22:06 +0000)]
Merge "autofill: fix window location in splitwindow and dialog" into pi-dev
Makoto Onuki [Wed, 4 Apr 2018 22:04:59 +0000 (15:04 -0700)]
Merge "Fix launcher apps reverse access" into pi-dev
am:
1fe71e24c8
Change-Id: I50c303ce9d8bcbb831d7d5dee28b31ff26d2c7bf
TreeHugger Robot [Wed, 4 Apr 2018 22:01:55 +0000 (22:01 +0000)]
Merge "Statsd config TTL" into pi-dev
Todd Kennedy [Wed, 4 Apr 2018 22:00:00 +0000 (15:00 -0700)]
Completely fill in permission info
During the refactor, an optimization was made to generatePermissionInfo()
to avoid creating duplicate PermissionInfo objects. However, the logic was
flawed and if a permission's protection level was ever adjusted, we
wouldn't return a properly filled out PermissionInfo object.
Change-Id: I70b3eda199008807182f75a413651d7cb4f4b7fd
Fixes:
74556457
Test: Manual; run app com.kakao.taxi and it doesn't crash
Ryan Mitchell [Wed, 4 Apr 2018 21:59:47 +0000 (14:59 -0700)]
Merge "Added --debug-mode flag to AAPT2" into pi-dev
am:
498baa82e6
Change-Id: I212efa4392f4da28817f88d589f865d17495f17c
Makoto Onuki [Wed, 4 Apr 2018 21:54:11 +0000 (21:54 +0000)]
Merge "Add basic inversion lock detection to DPMS." into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 21:53:04 +0000 (14:53 -0700)]
Merge "Added decoding of truncated AAPT string lengths." into pi-dev
am:
49668cd130
Change-Id: I18281fb6fd4f32ade20442b31b8af020070d2f24
Ryan Mitchell [Wed, 4 Apr 2018 21:46:55 +0000 (14:46 -0700)]
Merge "Fixed resource bag retrieval infinite recursion." into pi-dev
am:
1f76cbd738
Change-Id: I0dd918f8cbf2541d70c754fc859675949a2814b7
Lucas Dupin [Wed, 4 Apr 2018 21:32:53 +0000 (14:32 -0700)]
Shelf horizontal alignment was a few dps off
Also interpolating anti burn in offset instead of setting it.
Test: visual
Change-Id: Ib9248a89eaf8a8905f8d462cb8ded574975372a7
Fixes:
77541088
Treehugger Robot [Wed, 4 Apr 2018 21:42:17 +0000 (21:42 +0000)]
Merge "Hearing Aid: change get/set active device (3/3)"
Sunny Goyal [Wed, 4 Apr 2018 21:41:07 +0000 (14:41 -0700)]
Adding a utility method to show Assist session
Bug:
72122079
Test: Verified the library works with launcher
Change-Id: Ic1e9131687ea85fdcce16c71054ce7940c190504
Matthew Ng [Wed, 4 Apr 2018 21:33:00 +0000 (14:33 -0700)]
Puts back res id to correct view for the pinning tutorial
Put the wrong back button id for pinning tutorial in landscape
and now corrected it.
Test: manual - use 3 button nav bar, rotate to landscape and pin
Change-Id: I7cb2d61356226b11e7aa9b777e86badbf83a1f63
Fixes:
74174603
Makoto Onuki [Wed, 4 Apr 2018 21:36:31 +0000 (14:36 -0700)]
Merge "Simplify service wrapper initialization + make robust" into pi-dev
am:
291988ef59
Change-Id: Iaf87a5cf7f9bc3a949c55e8ca0f3eb91aebcbb24
Makoto Onuki [Wed, 4 Apr 2018 21:29:38 +0000 (21:29 +0000)]
Merge "Fix launcher apps reverse access" into pi-dev
Tarandeep Singh [Wed, 4 Apr 2018 21:26:02 +0000 (14:26 -0700)]
Merge "Fixed IMMS.DebugFlag#refresh() default value" into pi-dev
am:
6dd11b53e2
Change-Id: Ib2ee4399c9d0f0892e3c0894e245db96d6496e33
Ryan Mitchell [Wed, 4 Apr 2018 21:21:28 +0000 (21:21 +0000)]
Merge "Added --debug-mode flag to AAPT2" into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 21:21:10 +0000 (21:21 +0000)]
Merge "Added decoding of truncated AAPT string lengths." into pi-dev
Evan Laird [Wed, 4 Apr 2018 21:20:53 +0000 (14:20 -0700)]
Merge "Center airplane icon in its frame" into pi-dev
am:
ad9c39d571
Change-Id: I3ea27ceb7ce38ca8647cc9c72add1d91e99e9780
Ryan Mitchell [Wed, 4 Apr 2018 21:20:24 +0000 (21:20 +0000)]
Merge "Fixed resource bag retrieval infinite recursion." into pi-dev
Jean-Michel Trivi [Sat, 31 Mar 2018 01:27:50 +0000 (18:27 -0700)]
MediaCodecInfo: define AACObjectXHE profile level
Bug:
71430241
Test: CTS DecoderTest and DecoderTestAacDrc
Change-Id: I03ede882db420eeaa871991d1d5cba8955b2cdba
Makoto Onuki [Wed, 4 Apr 2018 21:15:46 +0000 (21:15 +0000)]
Merge "Simplify service wrapper initialization + make robust" into pi-dev
Winson Chung [Wed, 4 Apr 2018 21:10:46 +0000 (14:10 -0700)]
Merge changes from topic "navbar_fix" into pi-dev
am:
a20535b884
Change-Id: I7161c9bcc8fdf821a99c612647cede8edcb1ac19
TreeHugger Robot [Wed, 4 Apr 2018 21:04:51 +0000 (21:04 +0000)]
Merge "Fixed IMMS.DebugFlag#refresh() default value" into pi-dev
Abodunrinwa Toki [Wed, 4 Apr 2018 21:04:37 +0000 (14:04 -0700)]
Merge "Fix TCS crash due to API changes." into pi-dev
am:
d6997b05e0
Change-Id: Ieee28f1623704fc20925820b19a502da9ea27510
TreeHugger Robot [Wed, 4 Apr 2018 21:04:35 +0000 (21:04 +0000)]
Merge "Center airplane icon in its frame" into pi-dev
Phil Weaver [Wed, 4 Apr 2018 20:58:39 +0000 (13:58 -0700)]
Merge "Don't clear a11y focus with lock held" into pi-dev
am:
2c1f2dfb74
Change-Id: Ifc4da96727c52d112afa79ef32ca5f64a3fc171c
TreeHugger Robot [Wed, 4 Apr 2018 20:52:34 +0000 (20:52 +0000)]
Merge changes from topic "navbar_fix" into pi-dev
* changes:
Allow resolving the quickstep service when the user is unlocked
Revert "Revert "Nav icons and quick step states are determined by service enabled""
Eugene Susla [Wed, 4 Apr 2018 20:50:34 +0000 (13:50 -0700)]
Merge "[DO NOT MERGE] Fix a11y action "expand notifications" when QS is open" into pi-dev
am:
a60cb52487
Change-Id: Icf6d083068b7a5ae60bcd35ad0b17eb5e62e4728
Dmitry Dementyev [Wed, 4 Apr 2018 20:45:53 +0000 (13:45 -0700)]
Merge "Clean up remaining TODOs in RecoveryController." into pi-dev
am:
c9d8357069
Change-Id: I7bdbd247f4c1293f2ee5862e4caac468b2338873
Felipe Leme [Wed, 4 Apr 2018 20:41:00 +0000 (13:41 -0700)]
Merge "Log when save UI is not showing because of the service's response." into pi-dev
am:
c2e68785fb
Change-Id: I2bf482951c015631f4cd2be69dba13e0ecb7e278
Lucas Dupin [Wed, 4 Apr 2018 20:36:05 +0000 (13:36 -0700)]
Merge "Hide status bar when bouncer is visible" into pi-dev
am:
52ef03701f
Change-Id: I5d63b2c53561a6066c8f4c9ac228c46555cb3f29
TreeHugger Robot [Wed, 4 Apr 2018 20:29:22 +0000 (20:29 +0000)]
Merge "Fix TCS crash due to API changes." into pi-dev
Phil Weaver [Wed, 4 Apr 2018 20:28:18 +0000 (20:28 +0000)]
Merge "Don't clear a11y focus with lock held" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 20:26:23 +0000 (20:26 +0000)]
Merge "[DO NOT MERGE] Fix a11y action "expand notifications" when QS is open" into pi-dev
Dmitry Dementyev [Wed, 4 Apr 2018 20:25:39 +0000 (20:25 +0000)]
Merge "Clean up remaining TODOs in RecoveryController." into pi-dev
Felipe Leme [Wed, 4 Apr 2018 20:24:23 +0000 (20:24 +0000)]
Merge "Log when save UI is not showing because of the service's response." into pi-dev
Lucas Dupin [Wed, 4 Apr 2018 20:21:11 +0000 (20:21 +0000)]
Merge "Hide status bar when bouncer is visible" into pi-dev
Android Build Merger (Role) [Wed, 4 Apr 2018 19:59:46 +0000 (19:59 +0000)]
Merge "Merge "Modify isShowing method in Dialog" am:
46be1f15af am:
4b38e9587d" into pi-dev-plus-aosp
tiansiming [田思明] [Wed, 4 Apr 2018 19:59:09 +0000 (12:59 -0700)]
Merge "Modify isShowing method in Dialog" am:
46be1f15af
am:
4b38e9587d
Change-Id: Icbd590ffa9a8d0c744bac8a97780857c18595100
Matthew Ng [Wed, 4 Apr 2018 19:59:00 +0000 (12:59 -0700)]
Merge "Center layout of nav inflator to wrap content to tap other buttons" into pi-dev
am:
232efa8ce7
Change-Id: I478f3106d038f9c20ecdd8584d0456332046b177
Jeff Gaston [Wed, 4 Apr 2018 05:54:52 +0000 (01:54 -0400)]
Update for sdk drop
Bug:
77554455
Test: m -j checkbuild
Change-Id: Ia9255ae441d490276c7a9c498b75708f90bf84a1
Android Build Merger (Role) [Wed, 4 Apr 2018 19:54:45 +0000 (19:54 +0000)]
Merge "Merge "Check the size of the strings in the StringPool before flattening." into pi-dev am:
7281fe0a9b" into pi-dev-plus-aosp
Ryan Mitchell [Wed, 4 Apr 2018 19:54:28 +0000 (12:54 -0700)]
Merge "Check the size of the strings in the StringPool before flattening." into pi-dev
am:
7281fe0a9b
Change-Id: Id32a86c95b8a6da72e0abe20dc0e47355809e442
Android Build Merger (Role) [Wed, 4 Apr 2018 19:52:24 +0000 (19:52 +0000)]
Merge "Merge "Force creation of Socket upon Transform application" am:
119cf2bc61 am:
abcf07af81" into pi-dev-plus-aosp
Benedict Wong [Wed, 4 Apr 2018 19:52:00 +0000 (12:52 -0700)]
Merge "Force creation of Socket upon Transform application" am:
119cf2bc61
am:
abcf07af81
Change-Id: I2034448a22461d51728e66bcc0e965821aa4a42f
Bill Yi [Wed, 4 Apr 2018 19:49:40 +0000 (12:49 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
71cba7d0ec -s ours
Change-Id: I94947492b9487a7f8a59e74aeefe43e2a40a4534
Makoto Onuki [Tue, 3 Apr 2018 23:44:39 +0000 (16:44 -0700)]
Fix launcher apps reverse access
Trying to access other profiles from work profile shouldn't throw
security exception.
This is a partial revert of Ia4ddea58f66861ef760865b6d8831563584f85c9.
(Technically we should check the target user-id too, but that part isn't a
regression, so I'm not fixing that part.)
Bug:
77260666
Change-Id: I3f1f6584fcd6b879943d85ab4678b6130def0ba3
Fixes:
77260666
Test: atest /android/pi-dev/cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsProfileTest.java#testReverseAccessNoThrow
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
tiansiming [田思明] [Wed, 4 Apr 2018 19:47:13 +0000 (12:47 -0700)]
Merge "Modify isShowing method in Dialog"
am:
46be1f15af
Change-Id: I9d1cd55d51c37571d199ebbb5975f490e0969a92
Lucas Dupin [Wed, 4 Apr 2018 19:44:56 +0000 (12:44 -0700)]
Merge "Revert angle classifier relaxation" into pi-dev
am:
1119605853
Change-Id: Ifdca897151193c834860d0ff13f5d50b13c7c22c
Benedict Wong [Wed, 4 Apr 2018 19:43:36 +0000 (12:43 -0700)]
Merge "Force creation of Socket upon Transform application"
am:
119cf2bc61
Change-Id: Ia19da86a3fa40e309ff7a079307a8a63de8ba796
Bo Zhu [Wed, 4 Apr 2018 19:33:10 +0000 (12:33 -0700)]
Merge "Use Scrypt to hash long passwords in RecoverableKeyStore" into pi-dev
am:
e73074e9a8
Change-Id: I50e3ee0083badc478dd9be5c647b351bfd2a840c
Fyodor Kupolov [Wed, 4 Apr 2018 19:28:29 +0000 (12:28 -0700)]
Merge "Fix reading exception from Parcel" into pi-dev
am:
e269a5ac62
Change-Id: I3c4ee53e8f1e96f58034ac89e7f4bb65dd549120
Stephen [Wed, 4 Apr 2018 19:23:19 +0000 (12:23 -0700)]
Merge "Adding methods to greylist Test: None" into pi-dev
am:
657f173a6d
Change-Id: I1fb8639c718965a00fad6325f6af392dc1b49aaa
TreeHugger Robot [Wed, 4 Apr 2018 19:22:00 +0000 (19:22 +0000)]
Merge "Center layout of nav inflator to wrap content to tap other buttons" into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 19:21:47 +0000 (19:21 +0000)]
Merge "Check the size of the strings in the StringPool before flattening." into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 19:20:49 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
OSDN Git Service
