OSDN Git Service

android-x86/frameworks-base.git
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 "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 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 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 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 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 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 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

6 years agoMerge "Unregister lux sensor when not in adaptive mode." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 22:38:41 +0000 (22:38 +0000)]
Merge "Unregister lux sensor when not in adaptive mode." into pi-dev

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

6 years agoMerge "Fix location settings bug on non-GPS devices" into pi-dev
Maggie Wang [Wed, 21 Mar 2018 22:19:49 +0000 (22:19 +0000)]
Merge "Fix location settings bug on non-GPS devices" into pi-dev
am: b2637dac49

Change-Id: I538247bf9b4ccb735f5e84b7989683ea53344849

6 years agoMerge "Merge "Fix wrong SafeUnref type" into pi-dev am: b09f2b5926" into pi-dev-plus...
Android Build Merger (Role) [Wed, 21 Mar 2018 22:13:35 +0000 (22:13 +0000)]
Merge "Merge "Fix wrong SafeUnref type" into pi-dev am: b09f2b5926" into pi-dev-plus-aosp

6 years agoMerge "Fix wrong SafeUnref type" into pi-dev
John Reck [Wed, 21 Mar 2018 22:12:59 +0000 (22:12 +0000)]
Merge "Fix wrong SafeUnref type" into pi-dev
am: b09f2b5926

Change-Id: Ia85990286f15d98683518b61cfc57e8ea61674fc

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

Change-Id: I2b2eea70d0c755acc9c2f14a79bca91ea37720d1

6 years agoMerge "Add alpha Strings to CellIdentityTdscdma" am: 08ee27ff90
nharold [Wed, 21 Mar 2018 22:10:06 +0000 (22:10 +0000)]
Merge "Add alpha Strings to CellIdentityTdscdma" am: 08ee27ff90
am: 90ee815ad8  -s ours

Change-Id: If6ae5676b44b87cc64bc37ebf5628a97e1f57d54

6 years agoEnable new data usage settings features.
Jan Nordqvist [Wed, 21 Mar 2018 22:09:04 +0000 (15:09 -0700)]
Enable new data usage settings features.

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I0d2942bf8b8e13ebefd7df899a6ecfc6595d1780

6 years agoMerge "Calls unlinkToDeath in binderDied to deregister"
Treehugger Robot [Wed, 21 Mar 2018 22:04:50 +0000 (22:04 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister"

6 years agoMerge "Revert "Logging: Bluetooth Enabled"" am: 21a9ebeb6c
Yueming Wang [Wed, 21 Mar 2018 22:04:06 +0000 (22:04 +0000)]
Merge "Revert "Logging: Bluetooth Enabled"" am: 21a9ebeb6c
am: 4871761e31

Change-Id: I80622bf93288cf21defbf3a75e698c99c1a1717f

6 years agoMerge "Add alpha Strings to CellIdentityTdscdma"
nharold [Wed, 21 Mar 2018 22:03:21 +0000 (22:03 +0000)]
Merge "Add alpha Strings to CellIdentityTdscdma"
am: 08ee27ff90

Change-Id: If7773f0c56c3655398f15840bc9fd446755093a1

6 years agoMerge "Fix location settings bug on non-GPS devices" into pi-dev
Maggie Wang [Wed, 21 Mar 2018 22:02:03 +0000 (22:02 +0000)]
Merge "Fix location settings bug on non-GPS devices" into pi-dev

6 years agoMerge "Remove am/wm.proto which is redundant. The naming convention is defined in...
Yi Jin [Wed, 21 Mar 2018 21:49:17 +0000 (21:49 +0000)]
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
am: 32ca41d028

Change-Id: I73b1ed0210f01ad6bf81089fef408765f34426a1

6 years agoMerge "Enable Belarusian and Latin languages in fontchain_lint tool."
Treehugger Robot [Wed, 21 Mar 2018 21:48:08 +0000 (21:48 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool."

6 years agoMerge "By default, turn on signal strength update in power save mode." into pi-dev
Malcolm Chen [Wed, 21 Mar 2018 21:39:59 +0000 (21:39 +0000)]
Merge "By default, turn on signal strength update in power save mode." into pi-dev
am: b1223f4525

Change-Id: I209d99add22a23329537d3474b7f4a0565b7a8b2

6 years agoMerge changes I4c26aea7,I79911434 into pi-dev
Nathan Harold [Wed, 21 Mar 2018 21:35:13 +0000 (21:35 +0000)]
Merge changes I4c26aea7,I79911434 into pi-dev
am: 095b9e8e1c  -s ours

Change-Id: I19626bf87d31c759939c6aafc42ae679f6cb18e4

6 years agoMerge "Fix wrong SafeUnref type" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 21:34:10 +0000 (21:34 +0000)]
Merge "Fix wrong SafeUnref type" into pi-dev

6 years agoMerge "Define phone process as a constant" into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 21:32:06 +0000 (21:32 +0000)]
Merge "Define phone process as a constant" into pi-dev
am: 025cb0c392  -s ours

Change-Id: Iab4ce6f2b1cc069d1aa00b0865a67e191131fb9e

6 years agoUpdated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interva...
Liefu Liu [Wed, 21 Mar 2018 17:25:49 +0000 (10:25 -0700)]
Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync.

Bug: 76033438
Change-Id: I1ccb7ae174f8f13dae24296a3fb7e9dfcd77c7fa
Fixes: 76033438
Test: javadoc only. presubmit only.

6 years agoMerge "Remove am/wm.proto which is redundant. The naming convention is defined in...
TreeHugger Robot [Wed, 21 Mar 2018 21:24:19 +0000 (21:24 +0000)]
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev

6 years agoMerge "By default, turn on signal strength update in power save mode." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 21:11:39 +0000 (21:11 +0000)]
Merge "By default, turn on signal strength update in power save mode." into pi-dev

6 years agoDefine phone process as a constant
Brad Ebinger [Wed, 21 Mar 2018 21:10:46 +0000 (21:10 +0000)]
Define phone process as a constant
am: 1078b3a36b  -s ours

Change-Id: I36a9ef7016c3ea684bf8a0a02ff446727f3074ee

6 years agoMerge "Enable sanitizer on statsd eng build." into pi-dev
Yao Chen [Wed, 21 Mar 2018 21:06:54 +0000 (21:06 +0000)]
Merge "Enable sanitizer on statsd eng build." into pi-dev
am: dc5677336c

Change-Id: I4418b07d55e01eabfca0aabd6a54ea79ca456370

6 years agoMerge "Revert "Logging: Bluetooth Enabled""
Yueming Wang [Wed, 21 Mar 2018 21:05:59 +0000 (21:05 +0000)]
Merge "Revert "Logging: Bluetooth Enabled""
am: 21a9ebeb6c

Change-Id: I0f4649369bf3d4c92ef487eaa471ca9481185478

6 years agoMerge "Add Telecom debug setting for enabling enhanced call blocking."
Tyler Gunn [Wed, 21 Mar 2018 21:02:24 +0000 (21:02 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking."

6 years agoMerge "add car volume dialog" into pi-dev
Lujiang Xue [Wed, 21 Mar 2018 21:00:11 +0000 (21:00 +0000)]
Merge "add car volume dialog" into pi-dev
am: f2e00697a5

Change-Id: Idf420b47057eda6c759f40e9ce9ed9b7b55ec730

6 years agoMerge changes I4c26aea7,I79911434 into pi-dev
Nathan Harold [Wed, 21 Mar 2018 20:59:02 +0000 (20:59 +0000)]
Merge changes I4c26aea7,I79911434 into pi-dev

* changes:
  Check mOwnedByTransform to avoid DELSA on SPI
  Expose add/removeAddress for IpSecInterfaces

6 years agoMerge "Screenshot: extend scrim under cutout" into pi-dev
Adrian Roos [Wed, 21 Mar 2018 20:46:51 +0000 (20:46 +0000)]
Merge "Screenshot: extend scrim under cutout" into pi-dev
am: 113f9f85f4

Change-Id: If37d3ceb5c98c85e9d2b4aae6dd27fe7151bfc9c

6 years agoMerge "Define phone process as a constant" into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 20:38:00 +0000 (20:38 +0000)]
Merge "Define phone process as a constant" into pi-dev

6 years agoMerge "Add NonNull Annotations To IpSec API Surface" am: baa4bf51c1
nharold [Wed, 21 Mar 2018 20:37:59 +0000 (20:37 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface" am: baa4bf51c1
am: 08949e354f

Change-Id: I1aa2077978eba9e13586aeb4501769e2dd42728a

6 years agoMerge "Suppress all background-state services in user-forced app standby" into pi-dev
Christopher Tate [Wed, 21 Mar 2018 20:32:22 +0000 (20:32 +0000)]
Merge "Suppress all background-state services in user-forced app standby" into pi-dev
am: 431cd97bd8

Change-Id: I0d26a1eabe7d4ca6a9922bc7dc7f30488b5ba8d0

6 years agoMerge "Add NonNull Annotations To IpSec API Surface"
nharold [Wed, 21 Mar 2018 20:28:55 +0000 (20:28 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface"
am: baa4bf51c1

Change-Id: I1393526aca627b430868816a83c8a40452521fc2

6 years agoEnable Belarusian and Latin languages in fontchain_lint tool.
Xin Li [Wed, 21 Mar 2018 20:16:16 +0000 (13:16 -0700)]
Enable Belarusian and Latin languages in fontchain_lint tool.

Bug: 68058172
Merged-In: I747cbb5ea3d36ca63335bfe6b337fad1e75ee79b

6 years agoMerge "Return a boolean from the mandatory backup transport setter." into pi-dev
Lenka Trochtova [Wed, 21 Mar 2018 20:13:51 +0000 (20:13 +0000)]
Merge "Return a boolean from the mandatory backup transport setter." into pi-dev
am: 2f81559d29

Change-Id: Ibb77d5f16312f03504e7ced961b92e48f37342bc