OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Throw invalid cert exception when deprecated initRecoveryService method is...
Dmitry Dementyev [Mon, 2 Apr 2018 18:41:30 +0000 (18:41 +0000)]
Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev
am: bf08774704

Change-Id: Iee0b88661e5bbe67f6dcb7aa2027d0e5b123eef3

6 years agoMerge "Throw an exception if the given root alias is unknown" into pi-dev
Bo Zhu [Mon, 2 Apr 2018 18:37:04 +0000 (18:37 +0000)]
Merge "Throw an exception if the given root alias is unknown" into pi-dev
am: 49eb4c1f1f

Change-Id: I929c1ce5c10359a188ba2354697eda5cb8c17b08

6 years agoMerge "Slice row redlines and animations" into pi-dev
Lucas Dupin [Mon, 2 Apr 2018 18:32:37 +0000 (18:32 +0000)]
Merge "Slice row redlines and animations" into pi-dev
am: 9009654c1d

Change-Id: Id420d3c839a440d395212e30c26c67a7b79488fa

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:28:15 +0000 (18:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 07a75e0f9f  -s ours

Change-Id: I29c5bed425329d789b1bef6efb147e6bcbd4ad7b

6 years agoMerge "Change Locate to Map for address selections" into pi-dev
Jan Althaus [Mon, 2 Apr 2018 18:27:44 +0000 (18:27 +0000)]
Merge "Change Locate to Map for address selections" into pi-dev
am: 03061a7903

Change-Id: I9ce3068cc2c8b09a73b6ac1f1a9b5585c767f316

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:23:35 +0000 (18:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 38dccc3fff  -s ours

Change-Id: I9239d12a182a41dcb5db4a33f2b8fdac5aef5763

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 46b20b4e18  -s ours

Change-Id: Iff28e2792dafb0ed15eb975c0ac0bc2c3599ba15

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:22:24 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 292a890081  -s ours

Change-Id: Ifa5849d408d523391ddbb7fdd73b30b87c75f168

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:20:16 +0000 (18:20 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 5080670104  -s ours

Change-Id: I39a96d32716dc9a19c388ee3bced8ce69d4c9980

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:19:36 +0000 (18:19 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 89af056de6  -s ours

Change-Id: I567c278d8ef71c51aa49efc9164ff9023c0a7d4a

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:18:53 +0000 (18:18 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 86fdaf1a6b  -s ours

Change-Id: I703f51fd74171813ef4031eb697b084343b4cd4e

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:18:24 +0000 (18:18 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 2b7c92eb4c  -s ours

Change-Id: I8c8079497c4c764bb16994624ad76857daa97e20

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 18:15:09 +0000 (18:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7f32755459  -s ours

Change-Id: Ie0a719062161f41e9398e8468fc53ce92f356660

6 years agoMerge "Throw invalid cert exception when deprecated initRecoveryService method is...
Dmitry Dementyev [Sun, 1 Apr 2018 19:34:31 +0000 (19:34 +0000)]
Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev

6 years agoMerge "Throw an exception if the given root alias is unknown" into pi-dev
TreeHugger Robot [Sun, 1 Apr 2018 19:30:29 +0000 (19:30 +0000)]
Merge "Throw an exception if the given root alias is unknown" into pi-dev

6 years agoMerge "Slice row redlines and animations" into pi-dev
Lucas Dupin [Sun, 1 Apr 2018 16:13:49 +0000 (16:13 +0000)]
Merge "Slice row redlines and animations" into pi-dev

6 years agoThrow an exception if the given root alias is unknown
Bo Zhu [Fri, 30 Mar 2018 18:31:53 +0000 (11:31 -0700)]
Throw an exception if the given root alias is unknown

Bug: 76433465
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore

Change-Id: I3a213ab0cd3b0e9c002bc44d4ce929977e119e81

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 1 Apr 2018 04:08:32 +0000 (04:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 14:49:41 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8a72daf0c83337a251f03738393db2f7e26e9caf

6 years agoMerge "Change Locate to Map for address selections" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 21:24:14 +0000 (21:24 +0000)]
Merge "Change Locate to Map for address selections" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 20:00:20 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:50:38 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:50:34 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:50:29 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:43:35 +0000 (19:43 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:34:27 +0000 (19:34 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:23:45 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:23:20 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev
Evan Rosky [Sat, 31 Mar 2018 17:58:18 +0000 (17:58 +0000)]
Merge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev
am: e1059d9f5e

Change-Id: I640a4b7be42ed7a358731ef57635a1a27306175f

6 years agoMerge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 17:39:18 +0000 (17:39 +0000)]
Merge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 17:15:45 +0000 (10:15 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5d7ddd1457f94d5ed3ff3b914c37b019590c8dd8

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 17:08:50 +0000 (10:08 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iba86b12b7727eb9bfd90ded06bef2d692bf07268

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 17:02:04 +0000 (10:02 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5c88520a5bd2c221b0a088d8c3f5a9573145ae88

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 16:55:02 +0000 (09:55 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I75114b63fbb3d7728b3c51df6a4a1c5749c54651

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 15:36:47 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I92813ad5e33f77c4d2148454c35ee7a43da0825a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 15:23:18 +0000 (08:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib6847dd09539560b2c186a527a44294c86f211b2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 15:09:59 +0000 (08:09 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id29bf2572c1a71fe11c5786fee2afa6840b02c45

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 15:03:05 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I64c0dd3c17567e29b5b24a9674336b9821b6b6f2

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 31 Mar 2018 14:36:47 +0000 (14:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 74c2d21b71  -s ours

Change-Id: Ie2d847b5127990fd89e84d3838dce7215617104e

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 14:28:30 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 06:39:07 +0000 (23:39 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Bug: 76058207
Change-Id: I165c658f21866527efa64c72be81afe5b14f56a7

6 years agoThrow invalid cert exception when deprecated initRecoveryService method
Dmitry Dementyev [Sat, 31 Mar 2018 03:18:22 +0000 (20:18 -0700)]
Throw invalid cert exception when deprecated initRecoveryService method
is used.

Throw unsupported operation exception when older version of RecoveryController is used.

Bug: 77293264
Test: atest RecoveryControllerHostTest
Change-Id: I0003104a4305444fac0092f4f6929545cf7c9413

6 years agoMerge "Add callback onProfileAudioStateChanged()" into pi-dev
Ryan Lin [Sat, 31 Mar 2018 06:39:49 +0000 (06:39 +0000)]
Merge "Add callback onProfileAudioStateChanged()" into pi-dev
am: a29957d518

Change-Id: I781527469bd558617dee57ed431d072ab629705d

6 years agoMerge "Add callback onProfileAudioStateChanged()" into pi-dev
Ryan Lin [Sat, 31 Mar 2018 06:23:26 +0000 (06:23 +0000)]
Merge "Add callback onProfileAudioStateChanged()" into pi-dev

6 years agoMerge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev
Makoto Onuki [Sat, 31 Mar 2018 05:41:18 +0000 (05:41 +0000)]
Merge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev
am: 9cbf27af12

Change-Id: Icc350752c3ee97ddef8a412b6a16bd8795bd9c3c

6 years agoMerge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 05:24:20 +0000 (05:24 +0000)]
Merge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev

6 years agoMerge "Make changes to MBMS API following recs" into pi-dev
Hall Liu [Sat, 31 Mar 2018 05:10:46 +0000 (05:10 +0000)]
Merge "Make changes to MBMS API following recs" into pi-dev
am: 7bedbabd0b

Change-Id: I04bbec845c006659f5ca7eb70e752798a21c2050

6 years agoMerge "Add subtype for layout direction to Slice" into pi-dev
Mady Mellor [Sat, 31 Mar 2018 05:03:39 +0000 (05:03 +0000)]
Merge "Add subtype for layout direction to Slice" into pi-dev
am: 703f31db63

Change-Id: I2a9728249f2fac47593075dbe08d54988df82634

6 years agoMerge "E2e test for periodic alarm." into pi-dev
Yangster-mac [Sat, 31 Mar 2018 04:52:08 +0000 (04:52 +0000)]
Merge "E2e test for periodic alarm." into pi-dev
am: 46eef8d049

Change-Id: I36f2b86462e098cdd9225f74acf42825c75d536c

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 31 Mar 2018 04:46:49 +0000 (04:46 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: fbe387ab8f  -s ours

Change-Id: I13d2632771ce484fc08ce23ff817159652fccdcc

6 years agoMerge "Log sync enable/disable too" into pi-dev
Makoto Onuki [Sat, 31 Mar 2018 04:45:04 +0000 (04:45 +0000)]
Merge "Log sync enable/disable too" into pi-dev
am: 04ce26d840

Change-Id: I603d461cf83ff33d4ab6f74ee6d68e0795130fcf

6 years agoMerge "Make changes to MBMS API following recs" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 04:17:41 +0000 (04:17 +0000)]
Merge "Make changes to MBMS API following recs" into pi-dev

6 years agoMerge "Add subtype for layout direction to Slice" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 04:16:35 +0000 (04:16 +0000)]
Merge "Add subtype for layout direction to Slice" into pi-dev

6 years agoMerge "Migrate to AAPT2" into pi-dev
Alan Viverette [Sat, 31 Mar 2018 03:57:02 +0000 (03:57 +0000)]
Merge "Migrate to AAPT2" into pi-dev
am: 11bd1b601e

Change-Id: Ia1221be6801af09823770458cf708eacd369981e

6 years agoMerge "Correctly use int types and fix uint64_t print." into pi-dev
Yi Jin [Sat, 31 Mar 2018 03:50:36 +0000 (03:50 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev
am: 53f60f60ee

Change-Id: I34562b9ac0ee2a014b744ff786eaa578ed2061d8

6 years agoMerge "Fingerprint user canceled message should not be delayed" into pi-dev
Kevin Chyn [Sat, 31 Mar 2018 03:46:16 +0000 (03:46 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev
am: 374f6a26f9

Change-Id: Ibefdb50b12d74d1158a5ed91aaaf12b18310ab61

6 years agoMerge "Fix erroneous protected-broadcast check" into pi-dev
Makoto Onuki [Sat, 31 Mar 2018 03:41:50 +0000 (03:41 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev
am: 8c6aa94346

Change-Id: I42e5193e8710c4a04adb9ff66d2be21050627b3e

6 years agoMerge "Null pointer check for Bluetooth traffic" into pi-dev
Chenjie Yu [Sat, 31 Mar 2018 03:37:24 +0000 (03:37 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev
am: 2f6f33fa79

Change-Id: I25156d66b989d23ccf42e303138fcf5e27cc489e

6 years agoMerge "Statsd MAX now obeys refractory periods too" into pi-dev
Bookatz [Sat, 31 Mar 2018 03:29:38 +0000 (03:29 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev
am: 3b826c6075

Change-Id: I5741106ec3cd5a5d9c7a66796549982936c4f500

6 years agoMerge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
Bo Zhu [Sat, 31 Mar 2018 03:16:47 +0000 (03:16 +0000)]
Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
am: 8b60ebc6a6

Change-Id: Ie98c772deea51c25b075a92e2021257f41daf712

6 years agoMerge "Adding LauncherApps apis for suspended packages" into pi-dev
Suprabh Shukla [Sat, 31 Mar 2018 03:11:13 +0000 (03:11 +0000)]
Merge "Adding LauncherApps apis for suspended packages" into pi-dev
am: a6d6a5aa79

Change-Id: I2eb805342fc07944042b4668429a1a3f909cec2a

6 years agoMerge "Add some methods to manage slice permissios" into pi-dev
Jason Monk [Sat, 31 Mar 2018 03:05:38 +0000 (03:05 +0000)]
Merge "Add some methods to manage slice permissios" into pi-dev
am: 35201a6af2

Change-Id: I83f2d375465479e3f4f8af3790c5d42cf20d1c49

6 years agoMerge "E2e test for periodic alarm." into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 03:04:59 +0000 (03:04 +0000)]
Merge "E2e test for periodic alarm." into pi-dev

6 years agoMerge "Clear fingerprint stats after dump --proto" into pi-dev
Kevin Chyn [Sat, 31 Mar 2018 03:00:00 +0000 (03:00 +0000)]
Merge "Clear fingerprint stats after dump --proto" into pi-dev
am: 0d1debfcff

Change-Id: I213047cf6d62c747c16d8670da3781581f609841

6 years agoMerge "Merge "Make changes to MBMS API following recs" am: feb60e0864 am: 2fa2a9d06f...
Android Build Merger (Role) [Sat, 31 Mar 2018 02:55:42 +0000 (02:55 +0000)]
Merge "Merge "Make changes to MBMS API following recs" am: feb60e0864 am: 2fa2a9d06f" into pi-dev-plus-aosp

6 years agoMerge "Make changes to MBMS API following recs" am: feb60e0864
Hall Liu [Sat, 31 Mar 2018 02:54:39 +0000 (02:54 +0000)]
Merge "Make changes to MBMS API following recs" am: feb60e0864
am: 2fa2a9d06f

Change-Id: I3b1aef24454fa45ffbbf6bb003743e662eac0353

6 years agoMerge "Dynamics Processing Effect" into pi-dev
rago [Sat, 31 Mar 2018 02:53:00 +0000 (02:53 +0000)]
Merge "Dynamics Processing Effect" into pi-dev
am: d41d56e348

Change-Id: I192dc1b2b980b698695f31f0d1777f9c8c425cfb

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 02:51:37 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Fix regression to drawBitmapArray" into pi-dev
John Reck [Sat, 31 Mar 2018 02:46:22 +0000 (02:46 +0000)]
Merge "Fix regression to drawBitmapArray" into pi-dev
am: a26795a884

Change-Id: I1d9109dc95ec9b99f097bf5f34cdb036373f2332

6 years ago[automerger skipped] Merge "Update Bluetooth codec related strings" am: d10fd55a91
Pavlin Radoslavov [Sat, 31 Mar 2018 02:41:16 +0000 (02:41 +0000)]
[automerger skipped] Merge "Update Bluetooth codec related strings" am: d10fd55a91
am: 856fe46a69  -s ours

Change-Id: I01f8230057325a652a4d690cad500429673ef7db

6 years agoMerge "Make changes to MBMS API following recs"
Hall Liu [Sat, 31 Mar 2018 02:36:45 +0000 (02:36 +0000)]
Merge "Make changes to MBMS API following recs"
am: feb60e0864

Change-Id: I748bdcb23538f7c5e5d9bcc005df32fddd42602a

6 years agoMerge "Adding debug message inside NetworkServiceCallback." into pi-dev
Xiangyu/Malcolm Chen [Sat, 31 Mar 2018 02:36:05 +0000 (02:36 +0000)]
Merge "Adding debug message inside NetworkServiceCallback." into pi-dev
am: 17d19b7d52

Change-Id: Icfec1153ed29ae096083d3260294b7b580e0285e

6 years agoMerge "Log sync enable/disable too" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 02:19:34 +0000 (02:19 +0000)]
Merge "Log sync enable/disable too" into pi-dev

6 years agoMerge "Migrate to AAPT2" into pi-dev
Alan Viverette [Sat, 31 Mar 2018 02:11:59 +0000 (02:11 +0000)]
Merge "Migrate to AAPT2" into pi-dev

6 years agoMerge "Correctly use int types and fix uint64_t print." into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 02:08:12 +0000 (02:08 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev

6 years agoMerge "Make OMAPI stricter" am: 998ef794a3
Ruchi Kandoi [Sat, 31 Mar 2018 01:58:59 +0000 (01:58 +0000)]
Merge "Make OMAPI stricter" am: 998ef794a3
am: 43056194a5

Change-Id: I7d19c85a4068ff2cab66f316689fcc25501133c2

6 years agoMerge "Fingerprint user canceled message should not be delayed" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 01:52:37 +0000 (01:52 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev

6 years agoMerge "Require signing cert history certs to be unique." into pi-dev
Daniel Cashman [Sat, 31 Mar 2018 01:47:15 +0000 (01:47 +0000)]
Merge "Require signing cert history certs to be unique." into pi-dev
am: d05c00fbb6

Change-Id: I003d18660bc920de1bb2378a46836790753447f2

6 years agoMerge "Update Bluetooth codec related strings"
Pavlin Radoslavov [Sat, 31 Mar 2018 01:46:33 +0000 (01:46 +0000)]
Merge "Update Bluetooth codec related strings"
am: d10fd55a91

Change-Id: Ie28703025f732e33abeac2e7d8121bc93eaa3db9

6 years agoMerge "Make OMAPI stricter"
Ruchi Kandoi [Sat, 31 Mar 2018 01:43:18 +0000 (01:43 +0000)]
Merge "Make OMAPI stricter"
am: 998ef794a3

Change-Id: I34232eea503b3d95b22d4a8fa9e366c857264e78

6 years agoMerge "Fix erroneous protected-broadcast check" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 01:41:57 +0000 (01:41 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev

6 years agoMerge "Remove getCurrentUser call to find an alternative" into pi-dev
Brian C. Young [Sat, 31 Mar 2018 01:39:51 +0000 (01:39 +0000)]
Merge "Remove getCurrentUser call to find an alternative" into pi-dev
am: 1b3844cb84

Change-Id: Id2ae3acaf7ac7af3b5d53703f229c60dd86124ac

6 years agoMerge "Fix BackgroundDexOptTest" into pi-dev
Calin Juravle [Sat, 31 Mar 2018 01:34:28 +0000 (01:34 +0000)]
Merge "Fix BackgroundDexOptTest" into pi-dev
am: ddc4e1ab06

Change-Id: Icd564239c493ed402fe9914f52c48da72a3d58db

6 years ago[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev
Benedict Wong [Sat, 31 Mar 2018 01:30:03 +0000 (01:30 +0000)]
[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev
am: 35147b2dae  -s ours

Change-Id: I80f554392a01a4942b5c4927b8ad13d11dd5490a

6 years agoMerge "Null pointer check for Bluetooth traffic" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 01:18:34 +0000 (01:18 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev

6 years agoMerge "Statsd MAX now obeys refractory periods too" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 01:10:57 +0000 (01:10 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev

6 years ago[automerger skipped] Disallow Reserved SPI Allocation
Nathan Harold [Sat, 31 Mar 2018 01:05:18 +0000 (01:05 +0000)]
[automerger skipped] Disallow Reserved SPI Allocation
am: 0f8c8bb01a  -s ours

Change-Id: I64fb79980348f96116ad73893571babe3d7d29a6

6 years agoMerge "Document expected colors, deprecate old ones" into pi-dev
Chris Craik [Sat, 31 Mar 2018 00:59:01 +0000 (00:59 +0000)]
Merge "Document expected colors, deprecate old ones" into pi-dev
am: dbd39fc619

Change-Id: Ie386264b33c3a546cdc0fbdaa6bb461865463558

6 years agoMerge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 00:56:22 +0000 (00:56 +0000)]
Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev

6 years agoMerge "Unhide @SystemApi Constructor" into pi-dev
Brad Ebinger [Sat, 31 Mar 2018 00:53:48 +0000 (00:53 +0000)]
Merge "Unhide @SystemApi Constructor" into pi-dev
am: 77fcc0da3b

Change-Id: Idbf2a71018f1bd06f8445b07fc52bc65cb6776f6

6 years agoMerge "Guardrail for dimension in condition in duration tracker." into pi-dev
Yangster-mac [Sat, 31 Mar 2018 00:49:16 +0000 (00:49 +0000)]
Merge "Guardrail for dimension in condition in duration tracker." into pi-dev
am: 014432cb67

Change-Id: I5801bf467d7635208b5ed93fa17b6f10fac81de1

6 years agoMerge "Adding LauncherApps apis for suspended packages" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 00:39:52 +0000 (00:39 +0000)]
Merge "Adding LauncherApps apis for suspended packages" into pi-dev

6 years agoLog sync enable/disable too
Makoto Onuki [Sat, 31 Mar 2018 00:32:57 +0000 (17:32 -0700)]
Log sync enable/disable too

Bug: 75262099
Test: build, boot, toggle settings from the Settings app
Change-Id: Ic15c66d6c434ab905bbf8a23552fd6ab49a06ac4

6 years agoMerge "Restored focusableViewAvailable logic on visibility change" into pi-dev
Evan Rosky [Sat, 31 Mar 2018 00:34:15 +0000 (00:34 +0000)]
Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev
am: 4d0a5fd7e7

Change-Id: I4f4805629698d306fbb8f40e3b62e0f2ca99ad8c

6 years agoMerge "Control the QS label marquees." into pi-dev
Amin Shaikh [Sat, 31 Mar 2018 00:29:24 +0000 (00:29 +0000)]
Merge "Control the QS label marquees." into pi-dev
am: b17c2388a5

Change-Id: I6e8f0108af5c63129c692da65cf65ffb7c935d25

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 31 Mar 2018 00:28:38 +0000 (17:28 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I58332b68e3b9bd0578e9e8ee5716bb1eec86af8e

6 years agoMerge "Make changes to MBMS API following recs"
Hall Liu [Sat, 31 Mar 2018 00:28:06 +0000 (00:28 +0000)]
Merge "Make changes to MBMS API following recs"

6 years agoMerge "Add some methods to manage slice permissios" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 00:26:06 +0000 (00:26 +0000)]
Merge "Add some methods to manage slice permissios" into pi-dev

6 years agoMerge "Clear fingerprint stats after dump --proto" into pi-dev
Kevin Chyn [Sat, 31 Mar 2018 00:22:11 +0000 (00:22 +0000)]
Merge "Clear fingerprint stats after dump --proto" into pi-dev

6 years agoMerge "Update Bluetooth codec related strings"
Treehugger Robot [Sat, 31 Mar 2018 00:16:42 +0000 (00:16 +0000)]
Merge "Update Bluetooth codec related strings"