Bonian Chen
aa08222778
Merge "[Settings] Refactor DataUsageSummaryPreferenceController"
2020-03-13 12:08:30 +00:00
Automerger Merge Worker
3fd54b4e67
Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9
...
Change-Id: I0f6034dca48a2f0e6461f6b0559bee0c81410f3f
2020-03-13 12:07:15 +00:00
Automerger Merge Worker
10ff4f4ab6
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf
...
Change-Id: I90719e21019d7acb9cd208b7b282a865919be775
2020-03-13 12:07:06 +00:00
Automerger Merge Worker
7ecae6dd06
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94
...
Change-Id: I07ac521d3822a644cad29667a59fd1ae0bf848a3
2020-03-13 12:06:59 +00:00
Bonian Chen
18bf77eef9
Merge "[Settings] Avoid crash when adding new APN"
2020-03-13 12:06:15 +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
Bonian Chen
5a3d379293
[Settings] Avoid crash when adding new APN
...
Avoid from crash when adding new APN.
Bug: 150567855
Test: manual
Change-Id: I8af369878eef763df2fcfe808740334d556a58b7
Merged-In: I70362a2aea15c5eb52d10af21025cf9643097803
2020-03-13 11:00:17 +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
Automerger Merge Worker
a0d1887a98
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172
...
Change-Id: Ief12d167f83e6898a16963fbd8718993a3e6d48d
2020-03-13 10:28:12 +00:00
Automerger Merge Worker
6865bece3c
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79
...
Change-Id: I6360f84936f696431af97c0cafe796c93e21f58a
2020-03-13 10:27:57 +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
57e2e2424a
Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c
...
Change-Id: I02a5ee42cd8e1f429b4f3031ac10c620eb5e3a16
2020-03-13 09:29:09 +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
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
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
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
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
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
Automerger Merge Worker
31f9002e3b
Merge "[Settings] Code refactor" am: a7a9863a52
am: a99bfeadf9
...
Change-Id: I16b8f6d6e48c7f1f8f6ef6e76b6eaf73269b2da0
2020-03-12 11:31:43 +00:00
Automerger Merge Worker
97bb8e9d34
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4
am: 6089a14883
...
Change-Id: If93befb35d7f8a6828568c977a75532332a71c93
2020-03-12 11:31:37 +00: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
45bfbc1ea1
Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3
...
Change-Id: I3d17f1c7d3c63dc5fd3ba67fd7ca30e68f302fb4
2020-03-12 10:49:29 +00:00
Automerger Merge Worker
5bbfb75207
DO NOT MERGE am: 37295f86bf
...
Change-Id: I036454e184e0a1d4fe26240c3a1ec25d4fd55061
2020-03-12 10:49:26 +00:00
TreeHugger Robot
8697de6be3
Merge "DO NOT MERGE" into qt-qpr1-dev
2020-03-12 10:36:01 +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
Automerger Merge Worker
8410f505cb
[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: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: If61a0c9903c1478420fb890f95bcd18bb4ac8baa
2020-03-12 02:20:09 +00:00
Automerger Merge Worker
5f2520f685
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: I19964afedd126b92b35977cc0a97abe1b8fb9ffc
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev
2020-03-12 01:35:21 +00:00
Automerger Merge Worker
3f24bd913b
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: I6fc9ada0bcd634423887709248c5e82f6085cc3f
2020-03-11 20:40:30 +00:00
Automerger Merge Worker
18d9d24ee3
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: I0f6d8eeec8469cfe05b36bfbf27687be2973108a
2020-03-11 20:29:24 +00:00