Automerger Merge Worker
b4ea5b0865
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: 58f8eded5d
...
Change-Id: I7f1941510bab18bd4f3a258525c1e535a909651a
2020-03-12 20:18:24 +00: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
5b1ea14640
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 75166350e2
...
Change-Id: Ifa995555e94b1f106b6222dcb663ff71bb712809
2020-03-12 18:14:43 +00:00
Automerger Merge Worker
2c01f26e38
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22
...
Change-Id: If098a49eba7d3f7cee8495afd3a71d0e8bd01c80
2020-03-12 18:12:00 +00:00
Automerger Merge Worker
5beca05a95
Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298 am: af76dea7d0
...
Change-Id: I146aa0e0bae31f453b8e2b326ea832581a6f71dc
2020-03-12 17:53:50 +00:00
Automerger Merge Worker
d914509538
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5 am: a6829d80b2
...
Change-Id: I6fc9961db5584868d792824086711f2b4d412c6a
2020-03-12 17:53:44 +00:00
Automerger Merge Worker
9469b91a22
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30
...
Change-Id: Iedfb2e19dfd12a5f6be25be28556d0d1fbc95def
2020-03-12 17:53:36 +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
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
319842707c
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514
...
Change-Id: I4c096d5162f1f33254319aefe020d019d164c890
2020-03-12 16:52:59 +00:00
Automerger Merge Worker
1032548a02
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458
...
Change-Id: I7ff717a072afb0b6e9351c2ba66b876b4f7b61d7
2020-03-12 16:52:26 +00:00
Automerger Merge Worker
624b3e089d
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009
...
Change-Id: I310b2d8699bf34e29ba16de6849c1a98b3cb92e0
2020-03-12 16:52:17 +00:00
Automerger Merge Worker
3b07b65009
[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: 999977ff27 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
2020-03-12 16:51:31 +00:00
Automerger Merge Worker
506585dd49
[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: 1b2cdfc1e0 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
2020-03-12 16:51:04 +00:00
Automerger Merge Worker
31b91d9a9f
[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 am: bde8ce85e0
...
Change-Id: Ie7f73d3599572b12b432ded791a89563ef489317
2020-03-12 16:50:13 +00:00
Automerger Merge Worker
391beafa9b
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c
...
Change-Id: I6e1448ada55f09c0010226f03a1ba8a9c5dff08b
2020-03-12 16:50:11 +00:00
Automerger Merge Worker
9b8c326fe8
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-12 16:49:16 +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
Automerger Merge Worker
67e5d0e911
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56
...
Change-Id: I727ee8ed6cf14ae75f49da9136f9f34b75033450
2020-03-12 16:19:38 +00:00
Automerger Merge Worker
7ca652e32e
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: fd8934f348
...
Change-Id: I65af0a2c35539093185de69903edeefb44f070ae
2020-03-12 16:19:32 +00:00
Automerger Merge Worker
f7e7def0a4
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433
...
Change-Id: I1b3492329d34e31a641e2c3c677c5511d3f9f6b3
2020-03-12 16:19:25 +00:00
Automerger Merge Worker
3bc2ed9708
[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: d4fd92c566 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 16:19:19 +00:00
Bonian Chen
0f15f98999
Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController"
2020-03-12 16:19:18 +00:00
Automerger Merge Worker
d782d88e5e
[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: 99eedee50f -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 16:19:10 +00:00
Automerger Merge Worker
c79de6aa02
[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 am: 751daad079
...
Change-Id: I72cbb0bc62253b0c18f40f5ef2b1a9ed30f4815a
2020-03-12 16:18:45 +00:00
Automerger Merge Worker
5d79efa587
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: da93669044
...
Change-Id: Ica43af29af88dc47eebc007421bad3ea7ccff31f
2020-03-12 16:18:43 +00:00
Automerger Merge Worker
55f5ffbd04
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: 08aec12201 -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-12 16:14:43 +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
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
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
2020-03-12 16:00:46 +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
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
Automerger Merge Worker
f980963514
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af
...
Change-Id: Idb839f020646f0abe4dbb338a7a15a7d1fbbe092
2020-03-12 12:15:29 +00:00
Alex Johnston
01d61e49af
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev
2020-03-12 12:00:49 +00:00
Automerger Merge Worker
eae9ffda6a
Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 am: 6714c01dd6
...
Change-Id: Ifbc48adf4e12ff4b9fe3c009c04e7fd4f9312b83
2020-03-12 11:42:14 +00:00
Automerger Merge Worker
b39c97b7e8
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 am: a7c8f74cb2
...
Change-Id: I557166bb0dc59de8660395c5dbbce8ad5430ed0b
2020-03-12 11:41:58 +00: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
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
