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
af76dea7d0
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809
am: 311510b298
...
Change-Id: I68c04709fd0a3a200eb402070a7556b95dbc8292
2020-03-12 16:57:35 +00:00
Automerger Merge Worker
a6829d80b2
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999
am: b9b0dd9bc5
...
Change-Id: Ie0816f485e3f25778ab913f4cf5cb82bcded70aa
2020-03-12 16:57:29 +00:00
Automerger Merge Worker
311510b298
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809
...
Change-Id: Icc7b441acfa3001d91a91175c6bf05eee5007984
2020-03-12 16:30:31 +00:00
Automerger Merge Worker
b9b0dd9bc5
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999
...
Change-Id: I36ea27d31eb7ce355e88bc2c4bbd1ed132359bc3
2020-03-12 16:30:25 +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
fd8934f348
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3
-s ours am: 56274ffaa3
...
Change-Id: I064ad39dd98fd5442c1fc1806205e1a9e8fac198
2020-03-12 16:13:11 +00:00
Automerger Merge Worker
8dfa636433
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
...
Change-Id: I29ec48cdee97305a70dba7fa76f28cb1a48ae5c9
2020-03-12 16:12:46 +00:00
Automerger Merge Worker
d4fd92c566
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours am: b2a718f62f
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Ibd2300aad66b2613a0ec5e4e9c42a50dde1ad9af
2020-03-12 16:12:10 +00:00
Automerger Merge Worker
99eedee50f
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours am: 0922e7fdcb
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Iee76dec583df021474f5dee13eb1b2085b126bb7
2020-03-12 16:02:22 +00:00
Automerger Merge Worker
751daad079
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours am: 6708ebae6d
...
Change-Id: Idef6515e39b51e3a03cac2daaa8a8f790c85a87e
2020-03-12 16:01:42 +00:00
Automerger Merge Worker
da93669044
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours am: 7dc37f978c
...
Change-Id: Id580a25bcf5f69aa555dd0fed9087527c36fcedf
2020-03-12 16:01:40 +00:00
Automerger Merge Worker
08aec12201
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: I01ba5349a4fef2ebf12a4e3d579e57f5e1e3b7fc
2020-03-12 16:00: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
Alex Johnston
01d61e49af
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev
2020-03-12 12:00:49 +00:00
hughchen
728d63c014
Use values-night to control the dark mode background color
...
Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia10f7bab0ec7781db8b4b4dbdf359bb8a87672cc
2020-03-12 19:47:44 +08:00
Automerger Merge Worker
6714c01dd6
Merge "[Settings] Code refactor" am: a7a9863a52
am: a99bfeadf9
...
Change-Id: Ia0c95ff025def6a48d1b84b7f499447912757c72
2020-03-12 11:31:41 +00:00
Automerger Merge Worker
a7c8f74cb2
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4
am: 6089a14883
...
Change-Id: Iec491d3c73c041e0c828a3c90575f3f3dd7d99ab
2020-03-12 11:31:30 +00:00
Edgar Wang
651edc5c44
Remove ignore test case
...
Fixes: 147865441
Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest
RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest
RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest
Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87
2020-03-12 19:21:36 +08:00
Automerger Merge Worker
a99bfeadf9
Merge "[Settings] Code refactor" am: a7a9863a52
...
Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
2020-03-12 11:19:13 +00:00
Automerger Merge Worker
6089a14883
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4
...
Change-Id: I66b1015bc59b4a123364bf013627facfce8c5905
2020-03-12 11:19:06 +00:00
Bonian Chen
a7a9863a52
Merge "[Settings] Code refactor"
2020-03-12 11:08:01 +00:00
Bonian Chen
39d12019e4
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION"
2020-03-12 11:06:51 +00:00
Automerger Merge Worker
56274ffaa3
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I17465ae7a650f532680446dc72eb315b9e16ba2d
2020-03-12 10:49:42 +00:00
TreeHugger Robot
8697de6be3
Merge "DO NOT MERGE" into qt-qpr1-dev
2020-03-12 10:36:01 +00:00
shafik
143ec3ec2b
Update ManageExternalStorageDetailsTest setUidMode
...
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
2020-03-12 09:43:55 +00:00
Automerger Merge Worker
b2a718f62f
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
2020-03-12 09:21:48 +00:00
Bonian Chen
bfc8714e1f
[Settings] Code refactor
...
Code refactor.
Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
2020-03-12 16:31:06 +08:00
Bonian Chen
35904059d0
[Settings] Fix behavior of mobile data plan
...
Fix UI issue.
Bug: 150352656
Test: make
Change-Id: If5c6fc3c07259c45eba4d0f1f76b7b6de20cc6f4
2020-03-12 16:26:51 +08:00
Bonian Chen
a9d89cfd60
[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION
...
Add flag for startActivity() with URI.
Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
2020-03-12 16:14:00 +08:00
Zhen Zhang
63c7c202d7
Log some actions for changing wifi hotspot config
...
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed
Added tests for logging actions in each controller's test.
Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest
Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
2020-03-12 01:06:46 -07:00
Automerger Merge Worker
5a870aa5d5
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
-s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
is in history
Change-Id: Iffc859da54d2e3b16d3f291a4e90349eff3b3d5e
2020-03-12 06:42:37 +00:00
Zoey Chen
e34dc697d2
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev
2020-03-12 06:40:04 +00:00
Automerger Merge Worker
a4fc50d316
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: If8c5007d7d1c2ca48420850acce74db358959f0f
2020-03-12 06:38:34 +00:00
Calvin Pan
59f5eb638e
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev
2020-03-12 06:25:11 +00:00
Automerger Merge Worker
548e9e0370
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I4ec3a3d4e082fb5f49de2aa1a48482e98afa9951
2020-03-12 06:03:43 +00:00
Automerger Merge Worker
4636557ab7
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ifd71046d26c35b9bd400d1bc9a164e2210630280
2020-03-12 06:03:23 +00:00