Automerger Merge Worker
1f835adb07
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a
...
Change-Id: I740e247daadfbfeb5ba763b6aa9ad783b6b81d4b
2020-03-16 01:52:09 +00:00
Edgar Wang
ed39b5bb1a
Merge "Remove duplicated index search data" into rvc-dev
2020-03-16 01:42:22 +00:00
Automerger Merge Worker
e080bd7985
Merge "Blur developer setting" into rvc-dev am: 59b3974433
...
Change-Id: Ibcb04fdd68889f304f67e02261c8484dff3afac5
2020-03-15 23:40:18 +00:00
Lucas Dupin
59b3974433
Merge "Blur developer setting" into rvc-dev
2020-03-15 23:28:13 +00:00
Automerger Merge Worker
5161dccb79
Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019
...
Change-Id: I1fd1f571bc19a2c4aa1a1eb2346fa97d2932f2d9
2020-03-13 23:42:42 +00:00
Automerger Merge Worker
c7bd3a2336
Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019
...
Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e
2020-03-13 23:42:29 +00:00
Treehugger Robot
9dec7506d3
Merge "Address cleanup comments from aosp/1234607"
2020-03-13 23:04:12 +00:00
Hall Liu
45e4b8948c
Rename NotificationChannel#setBlockableSystem
...
Rename the method to setBlockable. Also rename isBlockableSystem in the
same way.
Bug: 151311073
Test: atest NotificationChannelTest
Change-Id: I0504f8043dc864fe6677f2e65783068ffa3437ba
2020-03-13 13:54:10 -07:00
Automerger Merge Worker
e3aaaa8a59
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
...
Change-Id: I84f4e0575e252520704d6afec262ecb6de9f0916
2020-03-13 16:52:18 +00:00
TreeHugger Robot
907905bb96
Merge "Refine remove locale warning dialog string" into rvc-dev
2020-03-13 16:43:45 +00:00
Automerger Merge Worker
91002efcd6
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
...
Change-Id: I19c97f204b39f0097b32f433937fa40e555f03d5
2020-03-13 14:47:29 +00:00
Alex Johnston
37fa5bd059
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev
2020-03-13 14:28:15 +00:00
Automerger Merge Worker
eb4f8d7cca
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144
...
Change-Id: I3b4e01db0e0290290e6e962ae609f98521de23ee
2020-03-13 12:25:03 +00:00
Automerger Merge Worker
7bb65a19dc
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6
...
Change-Id: I380cb41a50e1dfc1edf9aca30c6dac14e33740d5
2020-03-13 12:24:48 +00:00
Automerger Merge Worker
fa889d4fec
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06
...
Change-Id: I7a64297cc60f20d560e811636c4d2678366282c1
2020-03-13 12:24:42 +00:00
Bonian Chen
aa08222778
Merge "[Settings] Refactor DataUsageSummaryPreferenceController"
2020-03-13 12:08:30 +00:00
Bonian Chen
52dd9f5abf
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController"
2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94
Merge "[Settings] Refactor DisabledSubscriptionController"
2020-03-13 11:52:53 +00:00
Automerger Merge Worker
e628466fc2
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98
...
Change-Id: I449647f069d2e356fd6fa7ed06e655e2c0ad9eb9
2020-03-13 10:48:10 +00:00
Automerger Merge Worker
0587fe1ced
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c
...
Change-Id: I9f0f6f0f404b35f05ac1b101b7a3e71bae6517c0
2020-03-13 10:48:05 +00:00
Bonian Chen
985352d172
Merge "[Settings] Refactor CarrierPreferenceController"
2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79
Merge "[Settings] Refactor Telephony PreferenceController"
2020-03-13 10:11:54 +00:00
Automerger Merge Worker
793fa69cf8
Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a
...
Change-Id: Ibd1693cfa19efadf1cba11180464cb199248780f
2020-03-13 09:39:00 +00:00
Automerger Merge Worker
95ada20d2e
Merge "Fix tests" into rvc-dev am: 6d8e0fed61
...
Change-Id: I2ebe208fd9795e122b650b93b8a2dc81fe0ae3e8
2020-03-13 09:38:46 +00:00
TreeHugger Robot
6d8e0fed61
Merge "Fix tests" into rvc-dev
2020-03-13 09:27:16 +00:00
Bonian Chen
1f1843f11c
Merge "[Settings] Refactor MmsMessagePreferenceController"
2020-03-13 09:08:18 +00:00
Bonian Chen
0971feaeda
[Settings] Code Refactor of MobileNetworkPreferenceController
...
Code Refactor of MobileNetworkPreferenceController
Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
2020-03-13 15:58:09 +08:00
Bonian Chen
1c51bd3981
[Settings] Refactor of ApnSettings
...
Refactor of ApnSettings
Bug: 150567855
Test: make
Change-Id: I1af5e30006a9e68316968807a2532e13398c7af4
2020-03-13 15:49:57 +08:00
Edgar Wang
3b47408016
Refine remove locale warning dialog string
...
- If the first language is not selected, just remove the body copy
else warning user the locale will change to another language.
Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Automerger Merge Worker
0bfda151bf
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
...
Change-Id: I6ecd56f6855cfd160e491472e1c5276deccde92d
2020-03-13 03:27:00 +00:00
TreeHugger Robot
89a6fafa33
Merge "Use values-night to control the dark mode background color" into rvc-dev
2020-03-13 03:13:27 +00:00
Rahul Sabnis
27d9ac4f1e
Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."
...
Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA
Reason for revert: Fixing breakage
Reverted Changes:
I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass...
I771ca0d57:Revert "Need to now pass in active device instead ...
I76529c7a1:Revert "Pass in active device to all BluetoothA2dp...
I297bda68d:Revert "Require user pass in a non-null BluetoothD...
I525327959:Revert "Pass in active device to all BluetoothA2dp...
I1d8660b11:Revert "Pass in active device to all BluetoothA2dp...
Bug: 147287141
Test: robotests
Merged-In: I5aecfa4b5a8e371b914573ddd080acb98078bfca
Change-Id: I5aecfa4b5a8e371b914573ddd080acb98078bfca
2020-03-12 16:37:23 -07:00
Julia Reynolds
49f40ee77b
Fix tests
...
Fixing one of them by removing an unneeded setting
Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Automerger Merge Worker
58f8eded5d
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538
...
Change-Id: I4316b557413cc003049cff812d3b09e6bc3aea4d
2020-03-12 20:03:04 +00:00
Zhen Zhang
0ad0a50538
Merge "Log some actions for changing wifi hotspot config" into rvc-dev
2020-03-12 19:47:42 +00:00
Automerger Merge Worker
75166350e2
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30
...
Change-Id: I9c14c035b88153c86a4c027e54fef5989f167a89
2020-03-12 17:53:31 +00:00
Automerger Merge Worker
4ce01a847c
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298
...
Change-Id: Ie775c149cc731bb606f6dcb86a75512855f4e150
2020-03-12 16:57:39 +00:00
Automerger Merge Worker
654b19e1d5
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5
...
Change-Id: I151894dc8de726b437ba6715ea783483ac9602fb
2020-03-12 16:57:33 +00:00
Bonian Chen
ac2c706809
Merge "[Settings] Fix behavior of mobile data plan"
2020-03-12 16:19:57 +00:00
Bonian Chen
0f15f98999
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController"
2020-03-12 16:19:18 +00:00
Automerger Merge Worker
60b59c3a56
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af
...
Change-Id: I430ce4669bb4f56a4a62d8dbeed09c269db6c275
2020-03-12 16:13:19 +00:00
Automerger Merge Worker
8dfa636433
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
...
Change-Id: I29ec48cdee97305a70dba7fa76f28cb1a48ae5c9
2020-03-12 16:12:46 +00:00
Alex Johnston
341f995971
DPC can be uninstalled in personal profile in New COPE
...
* For an organization-owned device, the DPC should be able to
be uninstalled in the personal profile. Previously, the
observed behaviour was that the uninstall button in the App
Info Screen was being greyed out.
* This was because the previous logic did not allow for
uninstalling any app which has a profile owner or device
owner on *any* user.
* This CL updates this logic, such that, for non-system apps
uninstalling is blocked only if the app has a profile owner
or device owner for the current calling user.
Bug: 149381804
Test: Manual testing
atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ifaf03daa41724dbbd869c7e1371a77cc39d15ac7
2020-03-12 13:38:19 +00:00
Bonian Chen
0a00f0c44c
[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController
...
use TelephonyManager's setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId
Bug: 150352656
Test: make
Change-Id: I61078c72c9a5374d4840869ecf9b65d4ce8ef85c
2020-03-12 20:57:09 +08:00
Bonian Chen
332de69f8e
[Settings] Refactor CarrierPreferenceController
...
Refactor CarrierPreferenceController
Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
2020-03-12 20:53:10 +08:00
Bonian Chen
99c0f3fe14
[Settings] Refactor MmsMessagePreferenceController
...
Refactor MmsMessagePreferenceController
Bug: 150352656
Test: make
Change-Id: Id72f8f95eb12bb5c8f060df6c247312c56f2e69a
2020-03-12 20:50:25 +08:00
Bonian Chen
b7891e879f
[Settings] Refactor Telephony PreferenceController
...
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController
Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
2020-03-12 20:43:54 +08:00
atrost
a84c219c30
Mark CHANGE_RESTRICT_SAW_INTENT as logging only
...
Test: m, flash
Test: adb shell dumpsys platform compat - the change is marked loggingOnly
Bug: 148009004
Change-Id: Ia04e8ef624a69feac7c68c858b48457385b9818a
2020-03-12 12:26:56 +00:00
Bonian Chen
29c1be284b
[Settings] Refactor DisabledSubscriptionController
...
Refactor DisabledSubscriptionController
Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
2020-03-12 20:17:17 +08:00
Bonian Chen
25abe19e10
[Settings] Refactor DataUsageSummaryPreferenceController
...
Refactoring DataUsageSummaryPreferenceController to use public API
Bug: 150352656
Test: make
Change-Id: I95612a1e4ca5e178776dd1042a6ccfef011ba50b
2020-03-12 20:11:31 +08:00