OSDN Git Service
Jack He [Mon, 26 Mar 2018 16:23:30 +0000 (16:23 +0000)]
Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev
am:
0aeb374380
Change-Id: I469475c793e5e04f3550d959415ff04c22da6952
TreeHugger Robot [Mon, 26 Mar 2018 16:06:22 +0000 (16:06 +0000)]
Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev
Jeff Sharkey [Mon, 26 Mar 2018 15:20:01 +0000 (15:20 +0000)]
Merge "Clear identity when asking for other users." into pi-dev
am:
8eaee9eea5
Change-Id: I64d1f725fe0653ef4512e73d92f411de78664989
Stanley Tng [Mon, 26 Mar 2018 15:12:34 +0000 (15:12 +0000)]
Merge changes from topic "cleanup-ble-app-list-at-death" into pi-dev
am:
dd7efc3287
Change-Id: I5300155237985128a9a4447d2e95aec60def6891
TreeHugger Robot [Mon, 26 Mar 2018 15:06:28 +0000 (15:06 +0000)]
Merge "Clear identity when asking for other users." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 15:03:19 +0000 (15:03 +0000)]
Merge changes from topic "cleanup-ble-app-list-at-death" into pi-dev
* changes:
Calls unlinkToDeath in binderDied to deregister
Remove BLE App entry from mBleApps list when App died
Julia Reynolds [Mon, 26 Mar 2018 14:47:48 +0000 (14:47 +0000)]
Merge "Consolidate logic for 'recent notifications'" into pi-dev
am:
ad06c5f603
Change-Id: Ie2347690b84d8bb9caf341ba2e2f8d0055735baf
Julia Reynolds [Mon, 26 Mar 2018 14:36:07 +0000 (14:36 +0000)]
Merge "Consolidate logic for 'recent notifications'" into pi-dev
Julien Desprez [Mon, 26 Mar 2018 13:59:52 +0000 (13:59 +0000)]
Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev
am:
b133cbfd0b
Change-Id: Ie0d9b0bc8ba702a9b54be2c690fe7de8d8820e02
Emilian Peev [Mon, 26 Mar 2018 13:50:36 +0000 (13:50 +0000)]
Merge changes from topic "executor_api" into pi-dev
am:
8cb2aba54d
Change-Id: I05c44edc448f83a023fe06f013433ec92b771b4d
Emilian Peev [Mon, 26 Mar 2018 13:46:48 +0000 (13:46 +0000)]
Camera: Async camera manager calls should use executors
am:
9129aa25c1
Change-Id: Idd12695a8cdd15522d167499deb7b119d5b7db45
Julien Desprez [Mon, 26 Mar 2018 13:45:45 +0000 (13:45 +0000)]
Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev
Beverly Tai [Mon, 26 Mar 2018 13:34:55 +0000 (13:34 +0000)]
Merge "Tweaks to wireless charging animation" into pi-dev
am:
361b809e08
Change-Id: I3efc3212fb6ba2cbdd3b3927954c2dbed3fa5a29
TreeHugger Robot [Mon, 26 Mar 2018 13:31:30 +0000 (13:31 +0000)]
Merge changes from topic "executor_api" into pi-dev
* changes:
Camera: Accept user-supplied executors in capture sessions
Camera: Async camera manager calls should use executors
Beverly Tai [Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)]
Merge "Tweaks to wireless charging animation" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 11:36:02 +0000 (11:36 +0000)]
Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev
am:
d21b33d8ca
Change-Id: Ic29104fbe78b9f3d022acaab7debdf1c9b38dd3a
Jaewan Kim [Mon, 26 Mar 2018 11:28:48 +0000 (11:28 +0000)]
Merge "MediaMetadata2: Remove radio constants" into pi-dev
am:
449e358fea
Change-Id: I11f2a0e3d6af1b9bf649aaed543f99e68af99043
Jaewan Kim [Mon, 26 Mar 2018 11:15:20 +0000 (11:15 +0000)]
Merge "MediaSession2: Revisit command code" into pi-dev
am:
ec0ab63ccb
Change-Id: I2827f7099008ebee00f9193e40258b74a0f5afec
David Brazdil [Mon, 26 Mar 2018 11:10:24 +0000 (11:10 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
am:
ab1abe1fe7
Change-Id: I8bdfadf38614b0a46545f564a03f6746263cafe4
Jaewan Kim [Mon, 26 Mar 2018 10:55:30 +0000 (10:55 +0000)]
Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:53:24 +0000 (10:53 +0000)]
Merge "MediaMetadata2: Remove radio constants" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:52:22 +0000 (10:52 +0000)]
Merge "MediaSession2: Revisit command code" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 10:49:21 +0000 (10:49 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
Benjamin Franz [Mon, 26 Mar 2018 09:29:29 +0000 (09:29 +0000)]
Merge "Expose hidden API to check whether a given package is state protected" into pi-dev
am:
3ff20e2257
Change-Id: I797fd24aff1afa3e37e6b5f4dbd93042b19ac369
Benjamin Franz [Mon, 26 Mar 2018 09:15:41 +0000 (09:15 +0000)]
Merge "Expose hidden API to check whether a given package is state protected" into pi-dev
David Brazdil [Mon, 26 Mar 2018 09:03:46 +0000 (10:03 +0100)]
Add more hidden API uses to light greylist
From bug reports.
Bug:
64382372
Bug:
76350169
Bug:
76329535
Bug:
76329536
Bug:
76355229
Bug:
76350172
Bug:
76384058
Bug:
76350170
Test: make
Change-Id: Id5f99235d0abc1a8326ed254dd835c9ac05dc996
Jaewan Kim [Mon, 26 Mar 2018 08:19:28 +0000 (08:19 +0000)]
Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev
am:
e711ebc4fa
Change-Id: I1a8a40b5e5a578af22f60a093c8259361addf7ba
Nicolas Geoffray [Mon, 26 Mar 2018 08:11:54 +0000 (08:11 +0000)]
Merge "Greylist camera API used by CameraITS test" into pi-dev
am:
3017136353
Change-Id: I7ee9b93ee5ce792338b17e5a3bc3942542196570
Jaewan Kim [Mon, 26 Mar 2018 08:10:44 +0000 (08:10 +0000)]
Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev
Jaewan Kim [Tue, 20 Mar 2018 07:19:07 +0000 (16:19 +0900)]
MediaSession2: Add CommandGroup#add/removeCommand(int)
Bug:
74648408
Test: Build
Change-Id: Icfcde5946e75ad74c2123be8064eb365366f5960
Jaewan Kim [Mon, 26 Mar 2018 05:13:37 +0000 (14:13 +0900)]
MediaMetadata2: Remove radio constants
Removeing radio constants until their names are finalized.
Bug:
75500592
Test: Build
Change-Id: I6f7a219c19dd24579a76c2064e9781ca53618c69
Nicolas Geoffray [Mon, 26 Mar 2018 08:03:10 +0000 (08:03 +0000)]
Merge "Add APIs to light grey." into pi-dev
am:
6b3e711eb4
Change-Id: I995f4a7476405cf536e94cc496790d28ef7f7eca
Nicolas Geoffray [Mon, 26 Mar 2018 07:58:43 +0000 (07:58 +0000)]
Merge "Greylist camera API used by CameraITS test" into pi-dev
Nicolas Geoffray [Mon, 26 Mar 2018 07:53:38 +0000 (07:53 +0000)]
Merge "Add APIs to light grey." into pi-dev
Jaewan Kim [Tue, 20 Mar 2018 07:11:40 +0000 (16:11 +0900)]
MediaSession2: Change return type of CommandGroup#getCommands()
Bug:
74648408
Test: Build
Change-Id: I443dd0a1f244b285754561a4c485ef2e8530d42d
Jaewan Kim [Tue, 20 Mar 2018 08:06:01 +0000 (17:06 +0900)]
MediaSession2: Revisit command code
Bug:
74648408
Test: Build
Change-Id: I0c66d6dec7f5a25bd4c36aa6e2c140951ea38855
Jaewan Kim [Mon, 26 Mar 2018 05:28:46 +0000 (05:28 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
am:
c92f8b4053
Change-Id: If507935451775e59e30465a48df8f6c5dc0a8050
Jaewan Kim [Mon, 26 Mar 2018 05:16:59 +0000 (05:16 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
am:
a6ba53d69d
Change-Id: Id3e25aa4e9f71d646f263de372901fbd35e81569
Jaewan Kim [Mon, 26 Mar 2018 05:12:17 +0000 (05:12 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 04:57:48 +0000 (04:57 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
Jeff Sharkey [Mon, 26 Mar 2018 04:53:29 +0000 (22:53 -0600)]
Clear identity when asking for other users.
Bug:
76394640
Test: nope
Change-Id: I8d1530ed01669947e91725e905240729e31c7234
Dmitry Dementyev [Mon, 26 Mar 2018 02:43:28 +0000 (02:43 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
am:
a5b29ffffe
Change-Id: Ida09ae3747db332fcaa4ccb8a2bb774c96ce0caf
Jaewan Kim [Mon, 26 Mar 2018 02:26:14 +0000 (02:26 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
am:
c4f56a6be5
Change-Id: Ifd0c8a4c07ee3ccb7b377cff486e67801750a7ee
Dmitry Dementyev [Mon, 26 Mar 2018 02:18:33 +0000 (02:18 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 02:07:57 +0000 (02:07 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:51:04 +0000 (01:51 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
am:
46c07f3bd3
Change-Id: I0ca72ddccf04ddc7ba5f1183a503d582dee733ad
Jaewan Kim [Mon, 26 Mar 2018 01:40:00 +0000 (01:40 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev
am:
a7fac1c115
Change-Id: I2243ddbc461aa577374954e09b09489ec1b9fcd5
Jaewan Kim [Mon, 26 Mar 2018 01:31:54 +0000 (01:31 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:24:21 +0000 (01:24 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 22:16:34 +0000 (22:16 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
am:
4b46d3e1e4
Change-Id: Ie509b2878708ec1e7466679f503ec73cc9288206
Jeff Sharkey [Sun, 25 Mar 2018 22:05:45 +0000 (22:05 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
Svetoslav Ganov [Sun, 25 Mar 2018 16:47:55 +0000 (16:47 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
am:
069aa9dce4
Change-Id: I661b94bbf31828963cd1b752fcdc457f72fa88b8
Svetoslav Ganov [Sun, 25 Mar 2018 16:32:54 +0000 (16:32 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 09:08:20 +0000 (03:08 -0600)]
Add UX string tweaks before string freeze.
Test: builds, boots
Bug:
76097999
Change-Id: I85e82a039d0b3b857257a3143a7b94de67ccada2
Suprabh Shukla [Sat, 24 Mar 2018 22:49:37 +0000 (22:49 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev
am:
6da53af9c5
Change-Id: Ic8ba83876a867fc57100b33b47cd8ef51be39dfe
TreeHugger Robot [Sat, 24 Mar 2018 22:36:21 +0000 (22:36 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev
Seigo Nonaka [Sat, 24 Mar 2018 21:20:11 +0000 (21:20 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
am:
5dbb3fe124
Change-Id: Idd0927134ecf65e42ee53d0898a149ce66bc30e2
TreeHugger Robot [Sat, 24 Mar 2018 21:03:31 +0000 (21:03 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
Chenjie Yu [Sat, 24 Mar 2018 16:41:14 +0000 (16:41 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
am:
c8ab224b2a
Change-Id: I600831c2369d5985c22d336e8915ae261b6dfb06
TreeHugger Robot [Sat, 24 Mar 2018 16:28:01 +0000 (16:28 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
Erik Kline [Sat, 24 Mar 2018 16:12:38 +0000 (16:12 +0000)]
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
am:
ca697c621e -s ours
Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
TreeHugger Robot [Sat, 24 Mar 2018 15:58:42 +0000 (15:58 +0000)]
Merge "Pass all relevant resolver info to netd" into pi-dev
Jack He [Sat, 24 Mar 2018 07:21:16 +0000 (00:21 -0700)]
AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString
Bug:
72647074
Test: make, dumpsys audio
Change-Id: Ieaf2bf0e0ef6624409d1e91d9a1d232726460fc7
Martijn Coenen [Sat, 24 Mar 2018 06:17:31 +0000 (06:17 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev
am:
96b341e43a
Change-Id: I925f2dd25d8fab1ddbef77e69778b7b07c4c1120
Svet Ganov [Sat, 24 Mar 2018 06:07:10 +0000 (06:07 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev
am:
457bcefb65
Change-Id: I40155c6ad7ebb8c6c2fec78800c382523ade19db
Martijn Coenen [Sat, 24 Mar 2018 05:58:25 +0000 (05:58 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:51:16 +0000 (05:51 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev
Salvador Martinez [Sat, 24 Mar 2018 05:31:49 +0000 (05:31 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev
am:
f43923f009
Change-Id: I367aa574c48ec365c03ddcfbe8c116ce500e1980
TreeHugger Robot [Sat, 24 Mar 2018 05:22:28 +0000 (05:22 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev
Nathan Harold [Sat, 24 Mar 2018 05:13:23 +0000 (05:13 +0000)]
Merge changes from topic "data-service-grant-policy" into pi-dev
am:
775e291c2e
Change-Id: I9e247071614faa673057335844a6d51bcbc43b8d
Nathan Harold [Sat, 24 Mar 2018 05:00:42 +0000 (05:00 +0000)]
Merge changes from topic "data-service-grant-policy" into pi-dev
* changes:
Add Permissions Grant for TelephonyDataService
Add a Method to Revoke DefaultGrant Permissions
Erik Kline [Sun, 4 Mar 2018 12:01:01 +0000 (21:01 +0900)]
Pass all relevant resolver info to netd
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug:
34953048
Bug:
64133961
Bug:
72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit
e5dac904d361a349f1cfc48500a678d22e3a7316)
Alan Viverette [Sat, 24 Mar 2018 04:57:26 +0000 (04:57 +0000)]
Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev
am:
9ecfce3b44
Change-Id: I08aec9e06936ae7704c449c0e6220ddc83222aec
TreeHugger Robot [Sat, 24 Mar 2018 04:39:20 +0000 (04:39 +0000)]
Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev
Stanley Tng [Sat, 24 Mar 2018 04:21:28 +0000 (04:21 +0000)]
Merge "Add new strings for Hearing Aid profile" into pi-dev
am:
45344b581c
Change-Id: Icb2a21269f2c0b1e10aa469ba33b816d8ff72121
Dmitry Dementyev [Sat, 24 Mar 2018 04:15:44 +0000 (04:15 +0000)]
Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev
am:
799c3a62f7
Change-Id: I532fae36d2cbb096ad0976cd6c619a5fddcee131
Stanley Tng [Sat, 24 Mar 2018 04:11:57 +0000 (04:11 +0000)]
Merge "Add new strings for Hearing Aid profile" into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 04:01:54 +0000 (04:01 +0000)]
Merge "Add more NonNull annotations to RecoveryController API" into pi-dev
am:
ea97f89048
Change-Id: I53fb3b3d1aca8c3beb63f135c26c0e669e2b91cf
Dmitry Dementyev [Sat, 24 Mar 2018 03:59:27 +0000 (03:59 +0000)]
Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 03:48:12 +0000 (03:48 +0000)]
Merge "Add more NonNull annotations to RecoveryController API" into pi-dev
Erik Kline [Sat, 24 Mar 2018 03:39:37 +0000 (03:39 +0000)]
Merge "Add a string message for Private DNS strict mode failure" into pi-dev
am:
a68dfc3cee
Change-Id: Ibbcd32e2035d4248053e0fd1d724985e889187f5
Kevin Chyn [Sat, 24 Mar 2018 03:32:49 +0000 (03:32 +0000)]
Merge "Add accessibility string for FingerprintDialog(impl) authenticated" into pi-dev
am:
266d179a04
Change-Id: I6a16480f615cdc72a84ae13a7c0a07b592c4ac93
Erik Kline [Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)]
Merge "Add a string message for Private DNS strict mode failure" into pi-dev
Kevin Chyn [Sat, 24 Mar 2018 03:21:24 +0000 (03:21 +0000)]
Merge "Add accessibility string for FingerprintDialog(impl) authenticated" into pi-dev
Jean-Michel Trivi [Sat, 24 Mar 2018 03:15:18 +0000 (03:15 +0000)]
Merge "PlayerBase: log when startWatching fails" into pi-dev
am:
3d9601d60e
Change-Id: Ifbaa316e788886e8b6503ae39f5ffcea9dc04ab6
Rohan Shah [Sat, 24 Mar 2018 03:07:36 +0000 (03:07 +0000)]
Merge "[QS] Update string name in prep for freeze" into pi-dev
am:
a5a9827328
Change-Id: I3a98ebf2aba2c74fbc39e5dbfeb4984da1351c80
Svet Ganov [Sat, 24 Mar 2018 00:44:30 +0000 (17:44 -0700)]
Notify all affected UIDs for user/audio restriction changes
Test: pass: adb shell am instrument -w com.android.frameworks.servicestests
/android.support.test.runner.AndroidJUnitRunner
pass: cts-tradefed run cts-dev -m CtsPermissionTestCases
-t android.permission.cts.AppOpsTest
Bug:
75274546
Change-Id: I788823fcc3ade8a4cf752d64bd11b87b212e4d31
John Reck [Sat, 24 Mar 2018 02:51:35 +0000 (02:51 +0000)]
Merge "Add missing computeOpacity call" into pi-dev
am:
3f5ab8bdf4
Change-Id: I7ba26906d57655421707d3d8734782c527de5e2e
Bill Yi [Sat, 24 Mar 2018 02:42:15 +0000 (02:42 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9491757682 -s ours
Change-Id: I3c80e3940ee74f0ceaa57a002c47db10c2b5da6f
Pavel Maltsev [Sat, 24 Mar 2018 02:41:40 +0000 (02:41 +0000)]
Merge "JobStore: persist unwanted set of capabilities" into pi-dev
am:
244df1e217
Change-Id: I726e25e9169a39cc6dc636ce866947e76ba388d1
Mohamed Abdalkader [Sat, 24 Mar 2018 02:37:50 +0000 (02:37 +0000)]
Merge "Unhide ImsReasonInfo Constructor" into pi-dev
am:
4f2e53fe48
Change-Id: I37d8fcfc10582f2c865b9c1a5df39e3ad788559c
Wale Ogunwale [Sat, 24 Mar 2018 02:18:52 +0000 (02:18 +0000)]
Merge "Make Assistant stack invisible behind split-screen stacks." into pi-dev
am:
b9e9f09486
Change-Id: I4aebdb83c4d74c52fbed4aa0d5ee94980ef514d2
TreeHugger Robot [Sat, 24 Mar 2018 02:14:38 +0000 (02:14 +0000)]
Merge "PlayerBase: log when startWatching fails" into pi-dev
Bill Yi [Sat, 24 Mar 2018 02:05:07 +0000 (02:05 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
02bfc97068 -s ours
Change-Id: I836fbf154864c5abc2fb890b0cdd70467636365d
TreeHugger Robot [Sat, 24 Mar 2018 02:01:17 +0000 (02:01 +0000)]
Merge "[QS] Update string name in prep for freeze" into pi-dev
Bill Yi [Sat, 24 Mar 2018 01:58:42 +0000 (01:58 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ceffe2fed9 -s ours
Change-Id: I5e6e9765bff6f15d04844f522fb4f54af9665e0f
Dmitry Dementyev [Sat, 24 Mar 2018 01:53:05 +0000 (01:53 +0000)]
Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev
am:
9cd3e43d86
Change-Id: Iec63cea0f5657aa763a45e7bbd8a21479459c892
Andrii Kulian [Sat, 24 Mar 2018 01:44:46 +0000 (01:44 +0000)]
Merge "Revert "Use transaction for local activity relaunch"" into pi-dev
am:
603b911e48
Change-Id: I9443d43e9758916eb2ec6721c1ca9992bd7b9d87
Kevin Chyn [Sat, 24 Mar 2018 01:12:19 +0000 (18:12 -0700)]
Add accessibility string for FingerprintDialog(impl) authenticated
Bug:
74456537
Test: builds
Change-Id: I1edb54334bf5e148bac6c9e1583c6fd36bd9095a
Android Build Merger (Role) [Sat, 24 Mar 2018 01:22:24 +0000 (01:22 +0000)]
Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am:
444885b10d" into pi-dev-plus-aosp
OSDN Git Service
