OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
Nathan Harold [Thu, 22 Mar 2018 19:11:11 +0000 (19:11 +0000)]
[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
am: 33ed612cca  -s ours

Change-Id: Ieca39ff6788ca7293ff95516120b947e502f4085

6 years agoMerge "Move provider access stats to frameworks/base" into pi-dev
Makoto Onuki [Thu, 22 Mar 2018 18:45:31 +0000 (18:45 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev
am: c7f6eadffc

Change-Id: I22451d7234f52332ddd5e4811f9fe9b957469265

6 years agoMerge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am...
Android Build Merger (Role) [Thu, 22 Mar 2018 18:38:24 +0000 (18:38 +0000)]
Merge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am: fe5fdb1213  -s ours" into pi-dev-plus-aosp

6 years ago[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master
Tej Singh [Thu, 22 Mar 2018 18:37:59 +0000 (18:37 +0000)]
[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master
am: fe5fdb1213  -s ours

Change-Id: I6b5a02d285536a5a4433aa4060e72cb7acd16e35

6 years agoMerge "heif: fix Exif extraction in mtp database" into pi-dev
Chong Zhang [Thu, 22 Mar 2018 18:36:24 +0000 (18:36 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev
am: 9e64c01d02

Change-Id: Ied34169a586b99b8833db8946f8e64409f2b79cd

6 years agoMerge "Add NonNull Annotations To IpSec API Surface" into pi-dev
Nathan Harold [Thu, 22 Mar 2018 18:31:03 +0000 (18:31 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev

6 years agoMerge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 18:28:41 +0000 (18:28 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
am: de6dfd93e5

Change-Id: If5937a6d59d7e386aa685570359df47cb34a8a98

6 years agoMerge "Dummy StatsLog class" into stage-aosp-master
Tej Singh [Thu, 22 Mar 2018 18:23:52 +0000 (18:23 +0000)]
Merge "Dummy StatsLog class" into stage-aosp-master

6 years agoMerge "Fixed autofill service metadata name on javadoc sample." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 18:23:06 +0000 (18:23 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
am: b030730aa8

Change-Id: Ic8c2eff923157be306dd401e47979a3337499919

6 years agoMerge "Remove the hard-coded counterId in VaultParams" into pi-dev
Bo Zhu [Thu, 22 Mar 2018 18:19:09 +0000 (18:19 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
am: 88956ce326

Change-Id: I9112e639ae556de60cc2da64eef283033e99cca6

6 years agoMerge "Unhide RecoveryController#getRootCertificates()" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:50:46 +0000 (17:50 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
am: c6bd185565

Change-Id: Ib81d1997ee46034dff4c8b9c45836f434f660f1a

6 years agoMerge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:45:01 +0000 (17:45 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
am: 3818de595b

Change-Id: Ie3aad7e53a3e359bd83602db3a85cf1ab497e7c2

6 years agoMerge "Move provider access stats to frameworks/base" into pi-dev
Makoto Onuki [Thu, 22 Mar 2018 17:42:13 +0000 (17:42 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev

6 years agoMerge "heif: fix Exif extraction in mtp database" into pi-dev
Chong Zhang [Thu, 22 Mar 2018 17:39:52 +0000 (17:39 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev

6 years agoMerge "Make QSTileImpl#mListeners thread safe." into pi-dev
Amin Shaikh [Thu, 22 Mar 2018 17:37:47 +0000 (17:37 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
am: 3bfa02a114

Change-Id: Iff73fc24b669ead73d67091805d809c60953e2e2

6 years agoMerge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:36:18 +0000 (17:36 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev

6 years agoMerge "Fixed autofill service metadata name on javadoc sample." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:33:36 +0000 (17:33 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev

6 years agoMerge "Remove the hard-coded counterId in VaultParams" into pi-dev
Bo Zhu [Thu, 22 Mar 2018 17:32:10 +0000 (17:32 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev

6 years agoMerge "Unhide RecoveryController#getRootCertificates()" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev

6 years agoMerge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:19:33 +0000 (17:19 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev

6 years agoMerge "Make QSTileImpl#mListeners thread safe." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 17:07:01 +0000 (17:07 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev

6 years agoMerge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:05:36 +0000 (17:05 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
am: 4e561f83cb

Change-Id: Id6e661b49cc9a28bb6464930210eac41f061d61a

6 years agoMerge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
Fyodor Kupolov [Thu, 22 Mar 2018 16:57:02 +0000 (16:57 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
am: 8055aa2434

Change-Id: Ia61b7426acef33ac4f19f4fdc133be2a84bbf49d

6 years agoMerge "Audio presentation: Docs & Testability fixes" into pi-dev
Mikhail Naganov [Thu, 22 Mar 2018 16:43:54 +0000 (16:43 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev
am: 397962981c

Change-Id: I6088df15fd85afd633f1111a7eb675bcd7c9ad95

6 years agoMerge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 16:24:53 +0000 (16:24 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev

6 years agoMerge "GNSS Model Name constant string and comment updates" into pi-dev
Wyatt Riley [Thu, 22 Mar 2018 16:24:51 +0000 (16:24 +0000)]
Merge "GNSS Model Name constant string and comment updates" into pi-dev
am: aa8cbab151

Change-Id: Idafb74af51dccbfe754f7dfc6a667fa13b310582

6 years agoMerge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
Fyodor Kupolov [Thu, 22 Mar 2018 16:21:24 +0000 (16:21 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev

6 years agoMerge "Audio presentation: Docs & Testability fixes" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 16:14:19 +0000 (16:14 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev

6 years agoMerge "GNSS Model Name constant string and comment updates" into pi-dev
Wyatt Riley [Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)]
Merge "GNSS Model Name constant string and comment updates" into pi-dev

6 years agoFixed autofill service metadata name on javadoc sample.
Felipe Leme [Thu, 22 Mar 2018 15:39:09 +0000 (08:39 -0700)]
Fixed autofill service metadata name on javadoc sample.

Bug: 72811034
Test: nope

Change-Id: I0367fa6ad1fa21c51dadb9706830bc50c3139cab

6 years agoMerge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
Michael Plass [Thu, 22 Mar 2018 15:17:30 +0000 (15:17 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
am: dddd69ef3e

Change-Id: I981b1d4fe36044e47b12051bf0dfd499eea2a155

6 years agoMerge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
Michael Plass [Thu, 22 Mar 2018 15:03:51 +0000 (15:03 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev

6 years agoMove provider access stats to frameworks/base
Makoto Onuki [Wed, 21 Mar 2018 04:22:37 +0000 (21:22 -0700)]
Move provider access stats to frameworks/base

Bug: 76037330
Test: boot and dumpsys activity provider ContactsProvider2
Change-Id: I69cfe0edc98da00d1212f57871646488f87eb8dd

6 years agoMerge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent...
Artem Iglikov [Thu, 22 Mar 2018 14:20:20 +0000 (14:20 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev
am: 3e4df18658

Change-Id: Ic23be0c9e0af0fe9ec153e90950dd4ea3a0bbeac

6 years agoMerge "Small fix for the key grant alias used in importKey" into pi-dev
Robert Berry [Thu, 22 Mar 2018 14:11:56 +0000 (14:11 +0000)]
Merge "Small fix for the key grant alias used in importKey" into pi-dev
am: f9332469a4

Change-Id: I43efcec91dc8c9e84cbefe2b0dcd7a089046cee3

6 years agoMerge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
Robert Berry [Thu, 22 Mar 2018 14:06:42 +0000 (14:06 +0000)]
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
am: 98ea60c427

Change-Id: Ibd8338f5568478b207e660aaaa03d11bde8fcfeb

6 years agoMerge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent...
TreeHugger Robot [Thu, 22 Mar 2018 14:04:20 +0000 (14:04 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev

6 years agoMerge "Small fix for the key grant alias used in importKey" into pi-dev
Robert Berry [Thu, 22 Mar 2018 13:55:31 +0000 (13:55 +0000)]
Merge "Small fix for the key grant alias used in importKey" into pi-dev

6 years agoUnhide RecoverySession#recoverKeyChainSnapshot() method
Robert Berry [Wed, 21 Mar 2018 16:31:52 +0000 (16:31 +0000)]
Unhide RecoverySession#recoverKeyChainSnapshot() method

The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.

Bug: 74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9

6 years agoUnhide RecoveryController#getRootCertificates()
Robert Berry [Wed, 21 Mar 2018 21:57:07 +0000 (21:57 +0000)]
Unhide RecoveryController#getRootCertificates()

This is so we can add a GTS test to affirm that GMS devices include the
Google Cloud Key Vault root certificate.

Test: runtest frameworks-core -p android.security.keystore.recovery
Bug: 74621045
Change-Id: Ib6431f5739f3dff066832e6aa300dd9da5bc0727

6 years agoMerge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
Robert Berry [Thu, 22 Mar 2018 13:48:31 +0000 (13:48 +0000)]
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev

6 years agoDO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"
Artem Iglikov [Thu, 22 Mar 2018 12:18:07 +0000 (12:18 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"

This reverts commit f77cae61250c727630616b5672df2781e84a7e80.

Reason for revert: crashes SUW

Bug: 76128378
Change-Id: Ia77af64892aa5a03109cc4ef4c2c04b256000ba9

6 years agoMerge "Remove unnecessary Context from ApiLoader" into pi-dev
Christofer Åkersten [Thu, 22 Mar 2018 12:00:58 +0000 (12:00 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev
am: bf121d2f13

Change-Id: I4659cad049c4d5dde7fc4543501661a93d6fa362

6 years agoMerge "Fix index error" into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 11:54:05 +0000 (11:54 +0000)]
Merge "Fix index error" into pi-dev
am: ae2f368907

Change-Id: I818ce7bfe0fc6cb5f0bbe25ede1ac443ab7ef052

6 years agoMerge "Remove unnecessary Context from ApiLoader" into pi-dev
Christofer Åkersten [Thu, 22 Mar 2018 11:49:41 +0000 (11:49 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev

6 years agoMerge "Fix index error" into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 11:39:28 +0000 (11:39 +0000)]
Merge "Fix index error" into pi-dev

6 years agoMerge "Adds support for a fall-back model when the language-specific model is not...
Lukas Zilka [Thu, 22 Mar 2018 11:04:36 +0000 (11:04 +0000)]
Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev
am: f9593d62b3

Change-Id: I5e47cfee132c1c2f081dfd39ff428e8629714179

6 years agoMerge "Adds support for a fall-back model when the language-specific model is not...
TreeHugger Robot [Thu, 22 Mar 2018 10:50:47 +0000 (10:50 +0000)]
Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev

6 years ago[automerger skipped]Merge "Finalise STK call control strings" into pi-dev
Jordan Liu [Thu, 22 Mar 2018 09:02:47 +0000 (09:02 +0000)]
[automerger skipped]Merge "Finalise STK call control strings" into pi-dev
am: 0fe28341e5  -s ours

Change-Id: I7741825c787c2da43b5b405fcd09c0ff2088c535

6 years agoMerge "Finalise STK call control strings" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 08:49:38 +0000 (08:49 +0000)]
Merge "Finalise STK call control strings" into pi-dev

6 years agoMerge "Finalise STK call control strings" am: 249119da53
Jordan Liu [Thu, 22 Mar 2018 06:45:11 +0000 (06:45 +0000)]
Merge "Finalise STK call control strings" am: 249119da53
am: eef3fce35d

Change-Id: I1b9cdb97baecbb04052addcf14beca475a44200a

6 years agoMerge "Finalise STK call control strings"
Jordan Liu [Thu, 22 Mar 2018 06:34:31 +0000 (06:34 +0000)]
Merge "Finalise STK call control strings"
am: 249119da53

Change-Id: Id1179bcd212731f5ceff44ad45b9f7ab6643c5c6

6 years agoMerge "Letterbox: make letterbox work with drag resizing" into pi-dev
Adrian Roos [Thu, 22 Mar 2018 06:28:45 +0000 (06:28 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev
am: ab3ffe4194

Change-Id: I8efd0e9e90633147cbeaf22af9783ba30249e8ca

6 years agoMerge "Letterbox: make letterbox work with drag resizing" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 06:16:00 +0000 (06:16 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev

6 years ago[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am: a99b258049
Holly Jiuyu Sun [Thu, 22 Mar 2018 06:06:01 +0000 (06:06 +0000)]
[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am: a99b258049
am: 44975ee51f  -s ours

Change-Id: Iab4f2a3cbe355daa52b800a1775c25438b10ade5

6 years agoMerge "Mark eraseSubscriptions as @SystemApi."
Holly Jiuyu Sun [Thu, 22 Mar 2018 05:59:18 +0000 (05:59 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
am: a99b258049

Change-Id: Id2be8785239c34dbe705f0614aa9bfa9daa0aeec

6 years agoRemove unnecessary Context from ApiLoader
Christofer Åkersten [Thu, 22 Mar 2018 05:53:53 +0000 (14:53 +0900)]
Remove unnecessary Context from ApiLoader

Bug: 76001644
Test: compile
Change-Id: I6ac81dac16374d90facfe33c68607c5c286b335f

6 years agoRemove the hard-coded counterId in VaultParams
Bo Zhu [Thu, 22 Mar 2018 05:46:55 +0000 (22:46 -0700)]
Remove the hard-coded counterId in VaultParams

Bug: 72221676
Test: Manual test and runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore

Change-Id: I51cfac6478d59f41c1107106a14af008463f7de7

6 years agoFinalise STK call control strings
Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]
Finalise STK call control strings

Bug: 64685331
Bug: 70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Merged-In: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8

6 years agoMerge "Remove java-symbol for deleted string." into pi-dev
Andrew Sapperstein [Thu, 22 Mar 2018 05:41:01 +0000 (05:41 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev
am: 82a938c149

Change-Id: Ib3af18027bbcf2d2043aa881d9a840818470e5ff

6 years agoMerge "Remove java-symbol for deleted string." into pi-dev
Andrew Sapperstein [Thu, 22 Mar 2018 05:27:35 +0000 (05:27 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev

6 years agoMerge "Finalise STK call control strings"
Jordan Liu [Thu, 22 Mar 2018 05:14:31 +0000 (05:14 +0000)]
Merge "Finalise STK call control strings"

6 years agoMerge "Enable new data usage settings features." into pi-dev
Andreas Terzis [Thu, 22 Mar 2018 05:11:25 +0000 (05:11 +0000)]
Merge "Enable new data usage settings features." into pi-dev
am: 024cf8a707

Change-Id: I73da0aa1526652ed470bab9f4230149ab9b7c32b

6 years agoMerge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into...
Felipe Leme [Thu, 22 Mar 2018 05:05:25 +0000 (05:05 +0000)]
Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev
am: b3029a4f72

Change-Id: I042b254b83066a0f114f76ece040e3751a2a01e7

6 years agoMerge "Enable new data usage settings features." into pi-dev
Andreas Terzis [Thu, 22 Mar 2018 05:02:10 +0000 (05:02 +0000)]
Merge "Enable new data usage settings features." into pi-dev

6 years agoMerge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into...
Felipe Leme [Thu, 22 Mar 2018 04:50:04 +0000 (04:50 +0000)]
Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev

6 years agoMerge "Mark eraseSubscriptions as @SystemApi."
Holly Jiuyu Sun [Thu, 22 Mar 2018 03:45:55 +0000 (03:45 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."

6 years agoMerge "Make sure at least one non-aux IME is enabled" into pi-dev
Yohei Yukawa [Thu, 22 Mar 2018 03:20:36 +0000 (03:20 +0000)]
Merge "Make sure at least one non-aux IME is enabled" into pi-dev
am: 245f8e5ab5

Change-Id: Id200c9569b3d71636ca3a8b5f4facf609ffa23d0

6 years agoMerge "Make sure at least one non-aux IME is enabled" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 03:08:38 +0000 (03:08 +0000)]
Merge "Make sure at least one non-aux IME is enabled" into pi-dev

6 years agoUnhide the new RecoverySession#start with the alias for root cert
Bo Zhu [Thu, 22 Mar 2018 02:50:50 +0000 (19:50 -0700)]
Unhide the new RecoverySession#start with the alias for root cert

Bug: 76033708
Test: none, it's just unhiding APIs
Change-Id: Iec1e44d24bb1704da082404566233ada83b8eb81

6 years agoDummy StatsLog class
Tej Singh [Fri, 2 Mar 2018 02:22:55 +0000 (18:22 -0800)]
Dummy StatsLog class

This is a dummy class that provides StatsLog.write methods and
appropriate constants to log atoms in aosp.

Merged-In: Ib14a74eabfab08bbae5d4d549244f1022e8c34f0
Test: build success on Marlin
Change-Id: I606bc8a96337ced842eb7a2bcba8c4969c9d4748

6 years agoMerge "ScheduledJobStateChanged: add stop reason" into pi-dev
Tej Singh [Thu, 22 Mar 2018 01:43:52 +0000 (01:43 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev
am: dcccfd9742

Change-Id: Ie6d83624f3d607c5bd3d24aea0bcd28829a2f11a

6 years agoMerge "ScheduledJobStateChanged: add stop reason" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 01:30:52 +0000 (01:30 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev

6 years agoMerge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum...
Makoto Onuki [Thu, 22 Mar 2018 01:03:35 +0000 (01:03 +0000)]
Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev
am: b630550ed1

Change-Id: I55806fd7903861437daa1e2740006ef74e3ae2a2

6 years agoMerge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum...
Makoto Onuki [Thu, 22 Mar 2018 00:51:03 +0000 (00:51 +0000)]
Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev

6 years agodocs: fixing typo in reference document am: 60b06bd217
kopriva [Thu, 22 Mar 2018 00:50:46 +0000 (00:50 +0000)]
docs: fixing typo in reference document am: 60b06bd217
am: 2285a662ea

Change-Id: I0337d4a4ba2f30f89d97108163b5098fa51d20af

6 years agoMerge changes I7f413e38,I20aba7e9 into pi-dev
Jiyong Park [Thu, 22 Mar 2018 00:46:46 +0000 (00:46 +0000)]
Merge changes I7f413e38,I20aba7e9 into pi-dev
am: 4d6dc48d24

Change-Id: Ib63541d0924b400580d62513864d790a02021de9

6 years agoFinalise STK call control strings
Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]
Finalise STK call control strings

Bug: 64685331
Bug: 70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8

6 years agodocs: fixing typo in reference document
kopriva [Thu, 22 Mar 2018 00:39:02 +0000 (00:39 +0000)]
docs: fixing typo in reference document
am: 60b06bd217

Change-Id: Ie0a6380e8287d49b4d80f8742e51345372e5b8a9

6 years agoMerge changes I7f413e38,I20aba7e9 into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 00:29:38 +0000 (00:29 +0000)]
Merge changes I7f413e38,I20aba7e9 into pi-dev

* changes:
  Remove FlpHardwareProvider
  Create the stubs lib for com.android.location.provider

6 years agoSmall fix for the key grant alias used in importKey
Bo Zhu [Wed, 21 Mar 2018 21:33:15 +0000 (14:33 -0700)]
Small fix for the key grant alias used in importKey

Bug: 74345822
Test: atest RecoveryControllerHostTest#testImportKey_ValidKey
Change-Id: I54812b3d7465ee508fe48886f5897470fe7455a0

6 years agoMerge "Merge "Calls unlinkToDeath in binderDied to deregister" am: 72fa61b325 am...
Android Build Merger (Role) [Wed, 21 Mar 2018 23:39:58 +0000 (23:39 +0000)]
Merge "Merge "Calls unlinkToDeath in binderDied to deregister" am: 72fa61b325 am: d961f427a4" into pi-dev-plus-aosp

6 years agoMerge "Calls unlinkToDeath in binderDied to deregister" am: 72fa61b325
Stanley Tng [Wed, 21 Mar 2018 23:39:20 +0000 (23:39 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister" am: 72fa61b325
am: d961f427a4

Change-Id: Ifdea142fadf2299246efd8f5807c58177c561079

6 years agoMerge "Revert "By default, turn on signal strength update in power save mode."" into...
Xiangyu/Malcolm Chen [Wed, 21 Mar 2018 23:36:49 +0000 (23:36 +0000)]
Merge "Revert "By default, turn on signal strength update in power save mode."" into pi-dev
am: 86259365d4

Change-Id: I404949bbd804091eeb657ae73b50af482f4b5489

6 years agoRenamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES.
Felipe Leme [Wed, 21 Mar 2018 00:12:17 +0000 (17:12 -0700)]
Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES.

The syntax of that setting changed from P Developer Preview1 to the final P, so
it's safer to use a new name than risk breaking devices during the update.

Bug: 74458004
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest\
FrameworksCoreTests:SettingsBackupTest

Change-Id: I1c507e8eae20f598dfe259178667ae6c2bc892ff

6 years agoMerge "Merge "[QS] Update long-press tooltip text" into pi-dev am: 1fbe7081ea" into...
Android Build Merger (Role) [Wed, 21 Mar 2018 23:32:43 +0000 (23:32 +0000)]
Merge "Merge "[QS] Update long-press tooltip text" into pi-dev am: 1fbe7081ea" into pi-dev-plus-aosp

6 years agoMerge "[QS] Update long-press tooltip text" into pi-dev
Rohan Shah [Wed, 21 Mar 2018 23:32:19 +0000 (23:32 +0000)]
Merge "[QS] Update long-press tooltip text" into pi-dev
am: 1fbe7081ea

Change-Id: Ic86cffcdda9992f0e240c4effc1d38352128f02f

6 years agoMerge "Merge "Enable Belarusian and Latin languages in fontchain_lint tool." am:...
Android Build Merger (Role) [Wed, 21 Mar 2018 23:30:14 +0000 (23:30 +0000)]
Merge "Merge "Enable Belarusian and Latin languages in fontchain_lint tool." am: b2df57a42f am: aef63dde70" into pi-dev-plus-aosp

6 years agoMerge "Enable Belarusian and Latin languages in fontchain_lint tool." am: b2df57a42f
Xin Li [Wed, 21 Mar 2018 23:29:47 +0000 (23:29 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool." am: b2df57a42f
am: aef63dde70

Change-Id: I4964c40d8444c194cd31db3f8042adab5a1e12a1

6 years agoMerge "Calls unlinkToDeath in binderDied to deregister"
Stanley Tng [Wed, 21 Mar 2018 23:29:40 +0000 (23:29 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister"
am: 72fa61b325

Change-Id: Ica7438fe5ebd978192226f3e2b8a0630b843b752

6 years agoMerge "Added BinderCallsStatsService" into pi-dev
Fyodor Kupolov [Wed, 21 Mar 2018 23:26:59 +0000 (23:26 +0000)]
Merge "Added BinderCallsStatsService" into pi-dev
am: 163a57d71e

Change-Id: I8e4d9269f4cdad6d809f13ffa9e1f1f2447965a3

6 years agoMerge "Enable Belarusian and Latin languages in fontchain_lint tool."
Xin Li [Wed, 21 Mar 2018 23:20:46 +0000 (23:20 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool."
am: b2df57a42f

Change-Id: I04c23e2c723e591e45310a8d380c2793e0fe05b4

6 years agoMerge "Revert "By default, turn on signal strength update in power save mode."" into...
Xiangyu/Malcolm Chen [Wed, 21 Mar 2018 23:18:25 +0000 (23:18 +0000)]
Merge "Revert "By default, turn on signal strength update in power save mode."" into pi-dev

6 years agoMerge "Add Telecom debug setting for enabling enhanced call blocking." am: 727097a400
Tyler Gunn [Wed, 21 Mar 2018 23:18:23 +0000 (23:18 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking." am: 727097a400
am: c0411e0be5

Change-Id: I99ba46420fb998112709d63abc502f6742e9558a

6 years agoRevert "By default, turn on signal strength update in power save mode."
Xiangyu/Malcolm Chen [Wed, 21 Mar 2018 22:28:32 +0000 (22:28 +0000)]
Revert "By default, turn on signal strength update in power save mode."

This reverts commit cbd29712a934ba1d29b5c5de6a48b22c976e4b8a.

Reason for revert:
No need for a config. We don't ever want to disable signal strength update in power save mode.

Bug: 69644626
Change-Id: I0a7bf991c36076b0eceb816eed1b1bf7434c1d3d

6 years agoMerge "[QS] Update long-press tooltip text" into pi-dev
Rohan Shah [Wed, 21 Mar 2018 23:11:32 +0000 (23:11 +0000)]
Merge "[QS] Update long-press tooltip text" into pi-dev

6 years agoMerge "Unregister lux sensor when not in adaptive mode." into pi-dev
Kenny Guy [Wed, 21 Mar 2018 23:04:56 +0000 (23:04 +0000)]
Merge "Unregister lux sensor when not in adaptive mode." into pi-dev
am: 96fd5d9ed2

Change-Id: Ie9cb13caa26aac1d204e2228997a3afc6460b7cb

6 years agoMerge "Added BinderCallsStatsService" into pi-dev
Fyodor Kupolov [Wed, 21 Mar 2018 23:02:58 +0000 (23:02 +0000)]
Merge "Added BinderCallsStatsService" into pi-dev

6 years agoMerge "Implement new BS warning / notification flow (1/2)" into pi-dev
Makoto Onuki [Wed, 21 Mar 2018 22:56:17 +0000 (22:56 +0000)]
Merge "Implement new BS warning / notification flow (1/2)" into pi-dev
am: ff61d8872c

Change-Id: I7d3709fcc5b51833c1747398ae488a872ce7a147

6 years agoRemove java-symbol for deleted string.
Andrew Sapperstein [Wed, 21 Mar 2018 22:46:50 +0000 (15:46 -0700)]
Remove java-symbol for deleted string.

Change-Id: Id686cc07aef4641327854dda20bace7b46cffe99
Fixes: 76110242
Bug: 72941316
Test: builds