OSDN Git Service
Android Build Merger (Role) [Thu, 22 Mar 2018 17:59:49 +0000 (17:59 +0000)]
Merge "Merge "Make QSTileImpl#mListeners thread safe." into pi-dev am:
3bfa02a114 am:
48dcf157ed"
Amin Shaikh [Thu, 22 Mar 2018 17:59:24 +0000 (17:59 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev am:
3bfa02a114
am:
48dcf157ed
Change-Id: I105bf4aa0e129141281ccb706ccb08e29c99f6b5
Calin Juravle [Thu, 22 Mar 2018 17:58:21 +0000 (17:58 +0000)]
Merge "Add extra checks around the profile file descriptor."
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
Felipe Leme [Thu, 22 Mar 2018 17:19:52 +0000 (17:19 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev am:
4e561f83cb
am:
16f6c77d95
Change-Id: Ifce1e7799f71fa1952ab490d5504275b702cf931
Fyodor Kupolov [Thu, 22 Mar 2018 17:07:14 +0000 (17:07 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev am:
8055aa2434
am:
c85d3b3e6a
Change-Id: Iaef55ec2eeec59c09499e6e1e99ddcccc143cc8d
TreeHugger Robot [Thu, 22 Mar 2018 17:07:01 +0000 (17:07 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." 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
Mikhail Naganov [Thu, 22 Mar 2018 16:57:05 +0000 (16:57 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev am:
397962981c
am:
0056af933e
Change-Id: I588333753dab8f67e14b1521f6695ecbe5920af3
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
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
Wyatt Riley [Thu, 22 Mar 2018 16:33:08 +0000 (16:33 +0000)]
Merge "GNSS Model Name constant string and comment updates" into pi-dev am:
aa8cbab151
am:
c0b6f1db3e
Change-Id: Ife249a2ce6508299199042b38612df3092c13502
Felipe Leme [Thu, 22 Mar 2018 16:24:53 +0000 (16:24 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." 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
Fyodor Kupolov [Thu, 22 Mar 2018 16:21:24 +0000 (16:21 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" 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
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
Michael Plass [Thu, 22 Mar 2018 15:31:17 +0000 (15:31 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev am:
dddd69ef3e
am:
ad35dfa2a1
Change-Id: I62266b86cf0ff8f664a62dd1ee673ce338c8d40e
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
Michael Plass [Thu, 22 Mar 2018 15:03:51 +0000 (15:03 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
Artem Iglikov [Thu, 22 Mar 2018 14:31:42 +0000 (14:31 +0000)]
[automerger skipped]Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev am:
3e4df18658
am:
2d05d85da1 -s ours
Change-Id: Ie648f1b6b112d1dcf447024a4eeea0fb49440338
Robert Berry [Thu, 22 Mar 2018 14:25:30 +0000 (14:25 +0000)]
Merge "Small fix for the key grant alias used in importKey" into pi-dev am:
f9332469a4
am:
157aee22f5
Change-Id: Ida134803f6c251448ba65cfcc87669c01ea99f2b
Robert Berry [Thu, 22 Mar 2018 14:20:27 +0000 (14:20 +0000)]
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev am:
98ea60c427
am:
60efe8379d
Change-Id: I5b04c097bb5f26fe031191bcc208db9408f998a3
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
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
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
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
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
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
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
Christofer Åkersten [Thu, 22 Mar 2018 12:07:20 +0000 (12:07 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev am:
bf121d2f13
am:
0f524c02b2
Change-Id: I648e9a39a7c546cedae9b20cc264dc88d9598473
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
Julia Reynolds [Thu, 22 Mar 2018 12:00:58 +0000 (12:00 +0000)]
Merge "Fix index error" into pi-dev am:
ae2f368907
am:
571c29428f
Change-Id: I000ceafa631ce39777eb1ef80503b7021de42170
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
Christofer Åkersten [Thu, 22 Mar 2018 11:49:41 +0000 (11:49 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 11:39:28 +0000 (11:39 +0000)]
Merge "Fix index error" into pi-dev
Lukas Zilka [Thu, 22 Mar 2018 11:12:24 +0000 (11:12 +0000)]
Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev am:
f9593d62b3
am:
a30195420a
Change-Id: I7b2f81fd136b56e05857c06c07be3af89eed2d1a
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
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
Jordan Liu [Thu, 22 Mar 2018 09:10:17 +0000 (09:10 +0000)]
[automerger skipped]Merge "Finalise STK call control strings" into pi-dev am:
0fe28341e5 -s ours
am:
c927760198 -s ours
Change-Id: I2c8cf7ee1cf48318ba83b8713b46f15c0dbe0a91
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
TreeHugger Robot [Thu, 22 Mar 2018 08:49:38 +0000 (08:49 +0000)]
Merge "Finalise STK call control strings" into pi-dev
Jordan Liu [Thu, 22 Mar 2018 06:57:35 +0000 (06:57 +0000)]
Merge "Finalise STK call control strings" am:
249119da53 am:
eef3fce35d
am:
3d361c7ce9
Change-Id: Iae2eab9bfa5c8b130d46eaad4bbcbcd5d00e163e
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
Adrian Roos [Thu, 22 Mar 2018 06:39:03 +0000 (06:39 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev am:
ab3ffe4194
am:
23aad993cf
Change-Id: Iabf023523da964f41d538dde1b71ac77d0836deb
Jordan Liu [Thu, 22 Mar 2018 06:34:31 +0000 (06:34 +0000)]
Merge "Finalise STK call control strings"
am:
249119da53
Change-Id: Id1179bcd212731f5ceff44ad45b9f7ab6643c5c6
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
TreeHugger Robot [Thu, 22 Mar 2018 06:16:00 +0000 (06:16 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev
Holly Jiuyu Sun [Thu, 22 Mar 2018 06:14:25 +0000 (06:14 +0000)]
[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am:
a99b258049 am:
44975ee51f -s ours
am:
1984d29700 -s ours
Change-Id: I2f473232f9d589d161bfc9cbafc0f180b63b5a54
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
Holly Jiuyu Sun [Thu, 22 Mar 2018 05:59:18 +0000 (05:59 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
am:
a99b258049
Change-Id: Id2be8785239c34dbe705f0614aa9bfa9daa0aeec
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
Andrew Sapperstein [Thu, 22 Mar 2018 05:53:58 +0000 (05:53 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev am:
82a938c149
am:
729081708f
Change-Id: I468bbfec77c9149952667968521c247e2bc7b898
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
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
Andrew Sapperstein [Thu, 22 Mar 2018 05:27:35 +0000 (05:27 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev
Andreas Terzis [Thu, 22 Mar 2018 05:21:50 +0000 (05:21 +0000)]
Merge "Enable new data usage settings features." into pi-dev am:
024cf8a707
am:
e388407713
Change-Id: Iefc6ced58f4b654ceb85b22ea7143d252c59c5ea
Felipe Leme [Thu, 22 Mar 2018 05:17:22 +0000 (05:17 +0000)]
Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev am:
b3029a4f72
am:
082126b397
Change-Id: I91fce8617a71c61fd38ad7117fd33c9af2a5854b
Jordan Liu [Thu, 22 Mar 2018 05:14:31 +0000 (05:14 +0000)]
Merge "Finalise STK call control strings"
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
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
Andreas Terzis [Thu, 22 Mar 2018 05:02:10 +0000 (05:02 +0000)]
Merge "Enable new data usage settings features." into pi-dev
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
Holly Jiuyu Sun [Thu, 22 Mar 2018 03:45:55 +0000 (03:45 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
Yohei Yukawa [Thu, 22 Mar 2018 03:32:36 +0000 (03:32 +0000)]
Merge "Make sure at least one non-aux IME is enabled" into pi-dev am:
245f8e5ab5
am:
368cc77d4b
Change-Id: Ic5842a6cb5ad78651ef4e112a017915a868ed95c
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
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
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
Tej Singh [Thu, 22 Mar 2018 02:20:22 +0000 (02:20 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev am:
dcccfd9742
am:
7b0b2422ed
Change-Id: Ideaea9c44cbcda65111306b12079e75bbb5ce367
Makoto Onuki [Thu, 22 Mar 2018 01:53:47 +0000 (01:53 +0000)]
Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev am:
b630550ed1
am:
5e8a50f135
Change-Id: Ia555e6a2b5c387a86966cd3e10c2e2af15d95589
Android Build Merger (Role) [Thu, 22 Mar 2018 01:48:57 +0000 (01:48 +0000)]
Merge "docs: fixing typo in reference document am:
60b06bd217 am:
2285a662ea am:
0dd8c40343"
TreeHugger Robot [Thu, 22 Mar 2018 01:48:40 +0000 (01:48 +0000)]
Merge "AudioService: check permission on forceVolumeControlStream"
kopriva [Thu, 22 Mar 2018 01:48:24 +0000 (01:48 +0000)]
docs: fixing typo in reference document am:
60b06bd217 am:
2285a662ea
am:
0dd8c40343
Change-Id: Iaa09e1c22a8cf705b6e5eeb989860b0d6d7dc8c2
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
Jiyong Park [Thu, 22 Mar 2018 01:41:21 +0000 (01:41 +0000)]
Merge changes I7f413e38,I20aba7e9 into pi-dev am:
4d6dc48d24
am:
189cc7df45
Change-Id: I725063a24bd1c5713cfbdd63753b8fdb0d552a26
TreeHugger Robot [Thu, 22 Mar 2018 01:30:52 +0000 (01:30 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev
Stanley Tng [Thu, 22 Mar 2018 01:29:34 +0000 (01:29 +0000)]
Merge "Merge "Calls unlinkToDeath in binderDied to deregister" am:
72fa61b325 am:
d961f427a4" into pi-dev-plus-aosp
am:
f61e6b2844
Change-Id: Ic729ef3b252376211e94eed71126c49179908a02
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
Xiangyu/Malcolm Chen [Thu, 22 Mar 2018 00:51:15 +0000 (00:51 +0000)]
Merge "Revert "By default, turn on signal strength update in power save mode."" into pi-dev am:
86259365d4
am:
b178b2d426
Change-Id: Ic0ec2d85e60a995821bdd8f95c633b5a5adcaf5c
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
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
Rohan Shah [Thu, 22 Mar 2018 00:47:02 +0000 (00:47 +0000)]
Merge "Merge "[QS] Update long-press tooltip text" into pi-dev am:
1fbe7081ea" into pi-dev-plus-aosp
am:
6209297cac
Change-Id: Icca6fc8ef92e396b8539154c9f24eabcc1d9c1aa
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
Xin Li [Thu, 22 Mar 2018 00:40:54 +0000 (00:40 +0000)]
Merge "Merge "Enable Belarusian and Latin languages in fontchain_lint tool." am:
b2df57a42f am:
aef63dde70" into pi-dev-plus-aosp
am:
3b6c4b612f
Change-Id: Ib3085a14cdfdaff4f92dd1588226cebb208f12b1
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
kopriva [Thu, 22 Mar 2018 00:39:02 +0000 (00:39 +0000)]
docs: fixing typo in reference document
am:
60b06bd217
Change-Id: Ie0a6380e8287d49b4d80f8742e51345372e5b8a9
Fyodor Kupolov [Thu, 22 Mar 2018 00:32:21 +0000 (00:32 +0000)]
Merge "Added BinderCallsStatsService" into pi-dev am:
163a57d71e
am:
c434073d49
Change-Id: I12cdf4815840286fe044b8071d70cca590497a86
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
Tyler Gunn [Thu, 22 Mar 2018 00:28:51 +0000 (00:28 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking." am:
727097a400 am:
c0411e0be5
am:
b77daf6a8f
Change-Id: I1ae91c6e5dc605c32845e6412baf383e3299a9ff
Kenny Guy [Thu, 22 Mar 2018 00:16:04 +0000 (00:16 +0000)]
Merge "Unregister lux sensor when not in adaptive mode." into pi-dev am:
96fd5d9ed2
am:
914c700f1d
Change-Id: I781164272fb5bebff87c23572c1a219deff3b842
Makoto Onuki [Thu, 22 Mar 2018 00:02:38 +0000 (00:02 +0000)]
Merge "Implement new BS warning / notification flow (1/2)" into pi-dev am:
ff61d8872c
am:
4e92e3b5a3
Change-Id: Iae5a438fb116f7a068e49e0b972627f74481ac92
Maggie Wang [Wed, 21 Mar 2018 23:58:33 +0000 (23:58 +0000)]
Merge "Fix location settings bug on non-GPS devices" into pi-dev am:
b2637dac49
am:
d57c508f5d
Change-Id: Ie05fbbeb119657cbae102e33baccf1677d1f4ba8
John Reck [Wed, 21 Mar 2018 23:56:02 +0000 (23:56 +0000)]
Merge "Merge "Fix wrong SafeUnref type" into pi-dev am:
b09f2b5926" into pi-dev-plus-aosp
am:
9eecfb03fd
Change-Id: I7c08e82c93d169cb097c73d60b617ed7bd20b01e
nharold [Wed, 21 Mar 2018 23:47:28 +0000 (23:47 +0000)]
[automerger skipped]Merge "Add alpha Strings to CellIdentityTdscdma" am:
08ee27ff90 am:
90ee815ad8 -s ours
am:
4b5d7d848e -s ours
Change-Id: Ib139bcc1e8562b08a39ffac0f7120199d6a9ffc7
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
Yueming Wang [Wed, 21 Mar 2018 23:41:36 +0000 (23:41 +0000)]
Merge "Revert "Logging: Bluetooth Enabled"" am:
21a9ebeb6c am:
4871761e31
am:
edd25c357d
Change-Id: I8cc784a2a5d599c73a96c227871b3915e9f2c30d
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
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
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
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
OSDN Git Service
