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
1e2416d458
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3
...
Change-Id: I415dc1c990098be2e95751fbe79dcc90d5e63ffa
2020-03-12 11:02:03 +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
Automerger Merge Worker
5fe624a009
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
...
Change-Id: Ib4a750e64f0e012e94898c15e1f369561231299a
2020-03-12 09:55:28 +00:00
Automerger Merge Worker
999977ff27
[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 09:55:22 +00:00
Automerger Merge Worker
1b2cdfc1e0
[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 09:55:01 +00:00
Automerger Merge Worker
bde8ce85e0
[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: I6a6e037cc80eb9f2cc505158e5f937b287c05254
2020-03-12 09:54:13 +00:00
Automerger Merge Worker
4cc152835c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c
...
Change-Id: I7ece5a97e683dec786ba8c95a7950bc4b4b0d693
2020-03-12 09:54:12 +00:00
Automerger Merge Worker
c90737a257
[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 09:53:24 +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
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
373caf5ddb
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 am: 779aa123c7 am: 3e46f0e167 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 07:32:49 +00:00
Automerger Merge Worker
aeda53e535
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56 am: bad44347d5
...
Change-Id: I46ea4ab65f975962028bea4042e0ec340d7c35e4
2020-03-12 07:32:16 +00:00
Automerger Merge Worker
3e46f0e167
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 am: 779aa123c7
...
Change-Id: Ia671f444da9ce999aa5a02022f38bbaf6ce033ab
2020-03-12 07:11:00 +00:00
Automerger Merge Worker
3574af3fa1
[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: 5a870aa5d5 -s ours am: 85c9d1dd97 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 07:10:48 +00:00
Automerger Merge Worker
521e3cde98
Merge "[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours" into rvc-d1-dev-plus-aosp am: 189116b4da -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 07:10:42 +00:00
Automerger Merge Worker
bad44347d5
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56
...
Change-Id: I144180075010cdce57933d3d5917dfba2aa66119
2020-03-12 07:10:06 +00:00
Automerger Merge Worker
b8821ea3a5
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316 am: 57dee00e9c
...
Change-Id: I4409045cf67050612ce502f3107d96e25da165c6
2020-03-12 07:09:53 +00:00
Automerger Merge Worker
ab91b6fc7d
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: 977a698823
...
Change-Id: I298f7c11b041c90716a27437a571537d156d5839
2020-03-12 07:09:31 +00:00
Automerger Merge Worker
779aa123c7
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56
...
Change-Id: I56bbe357b424ade4ce76ba892575c3363bf06c97
2020-03-12 06:55:22 +00:00
Automerger Merge Worker
c25ebdfb56
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25
...
Change-Id: Ia15ff888a6672e952120888f6348e9b3323540ae
2020-03-12 06:55:03 +00:00
Automerger Merge Worker
85c9d1dd97
[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: 5a870aa5d5 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 06:54:47 +00:00
Automerger Merge Worker
189116b4da
Merge "[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours" into rvc-d1-dev-plus-aosp
2020-03-12 06:54:30 +00:00
Automerger Merge Worker
236ef7c6bb
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 06:54:25 +00:00
Automerger Merge Worker
57dee00e9c
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316
...
Change-Id: I398b4c88516a2a8736cf48f788415a6651e23f0a
2020-03-12 06:54:23 +00:00
Automerger Merge Worker
977a698823
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25
...
Change-Id: I87825756a6920e39019c5dce12d34afb57c1f02f
2020-03-12 06:54:18 +00:00
Automerger Merge Worker
da23843848
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 9c46665173 am: b6abc73483
...
Change-Id: Ica7aab5739e6c1e72001fe787ceeb1c5eb7993cb
2020-03-12 06:43:02 +00:00
Automerger Merge Worker
05ce582a97
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11 am: ec663b1e15
...
Change-Id: I12d1035dac37228b921c7b863f857a11ec4a4fe8
2020-03-12 06:42:51 +00: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
2020-03-12 06:42:37 +00:00
Automerger Merge Worker
cae2447a56
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
...
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
2020-03-12 06:42:35 +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
c1059b0f25
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
2020-03-12 06:39:18 +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
Automerger Merge Worker
051bf1bd58
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370 am: c7501141ba
...
Change-Id: I7cb9630b99be9891ad9994d708cb479e6b8e8eb1
2020-03-12 06:31:48 +00:00
Automerger Merge Worker
441b50a0f2
Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp am: 141451127a
...
Change-Id: Ie62d2806d00cbf9ac374f4b0f9e90a0048d0e30d
2020-03-12 06:31:43 +00:00
Automerger Merge Worker
b6abc73483
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 9c46665173
...
Change-Id: Iaf9a5af1afd3b0289a0754d310915f024aee01c9
2020-03-12 06:31:29 +00:00
Automerger Merge Worker
e5be54a8f4
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807
...
Change-Id: I9fa93764a09a4f216db6cb3507c20e6c12c14d25
2020-03-12 06:31:28 +00:00
Automerger Merge Worker
ec663b1e15
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11
...
Change-Id: If6d818c6770910614b63ce502f2a4d506c0f98f2
2020-03-12 06:30:55 +00:00
Automerger Merge Worker
81f18805dd
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391
...
Change-Id: I1e08ca603df32db2d67eab07dd252792e77aaea9
2020-03-12 06:30:54 +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
c7501141ba
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370
...
Change-Id: I2bcc38d576f22a10a9e49c60f7963797496423e7
2020-03-12 06:18:24 +00:00
Automerger Merge Worker
9c46665173
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70
...
Change-Id: I68a43988057229deae3a5b4c9daff400b6b5393e
2020-03-12 06:18:16 +00:00
