SongFerng Wang
db6c2b7af3
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
am: 95f153642c
am: 3d14d61621
am: fa5a7f19dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I3a97b5f666c36647b58f00086b48c7b8e1e8f8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 08:18:28 +00:00
SongFerng Wang
fa5a7f19dc
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
am: 95f153642c
am: 3d14d61621
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I9fa7870cf4bde35bbbb8e812b21495ae6c8ebd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 08:00:44 +00:00
SongFerng Wang
3d14d61621
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
am: 95f153642c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I1418690d52c1e74f74f5d2bbf731ab5170e2c101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:44:37 +00:00
SongFerng Wang
95f153642c
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I2ed62ef98c1e81d6549ba1eb0c271ef3bf61d168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:27:08 +00:00
SongFerng Wang
a5a729f523
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: Ie1e14a6b697af624854a9360a60383fac63bb02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:22 +00:00
SongFerngWang
fbfaa331d2
Unable to enable the removable esim am: 56e1297abe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195
Change-Id: I02f2599c790c90a0b602b84bc8b511f521a7e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:21 +00:00
SongFerngWang
da2d1d85aa
Reuse the active esim slot am: 887bb592c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194
Change-Id: I273a609f8f615c9e74fbf416c859b5159ca420c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:20 +00:00
SongFerngWang
886193184d
stop show preferred SIM card dialog during sim switch am: faf9baf95b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121193
Change-Id: I3222b73bf7e01f30a56ba53cba04ed6cba45a608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:17 +00:00
SongFerng Wang
8be3ebd163
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4
...
* changes:
[MEP] Modify the comments
Unable to enable the removable esim
Reuse the active esim slot
stop show preferred SIM card dialog during sim switch
2022-06-14 06:34:07 +00:00
TreeHugger Robot
3897698b89
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
am: 2357b8ab44
am: 23eecdc87d
am: 6cd3d586a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I15d83cbbf39b5a1b007b9d25d296cc1ba6a08f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 04:48:52 +00:00
TreeHugger Robot
6cd3d586a5
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
am: 2357b8ab44
am: 23eecdc87d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I49cddbe7f0056b0801a0d07f2b704299df75e69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 04:02:28 +00:00
TreeHugger Robot
0ad035560f
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
am: 36c472970e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I34e631b2e35e1f311fb994e2fa80b3e1334562db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:45:23 +00:00
TreeHugger Robot
23eecdc87d
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
am: 2357b8ab44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I7ff555eb9816ccb2031ed4357b82e9ac7979c46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:45:22 +00:00
TreeHugger Robot
2357b8ab44
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: Ie245dbeecf179a41e19699c5fd8de5717da238d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:26:54 +00:00
TreeHugger Robot
36c472970e
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I0250905df7b4fca60115d7a2fd837e122efbae44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:25:27 +00:00
Jason Chiu
27c6b55ac5
Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link
...
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.
Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.
Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
2022-06-14 02:45:49 +00:00
Gil Cukierman
e20a350d2b
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
am: fecd7c1c1a
am: ad8685a28e
am: f5c8089089
am: 5050df400d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I85fcad295e430302911725bc33134c8f3633dcb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 21:42:34 +00:00
Gil Cukierman
5050df400d
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
am: fecd7c1c1a
am: ad8685a28e
am: f5c8089089
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I651849d152783f5df70f15f1c473c2ddceab8815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 21:23:10 +00:00
Gil Cukierman
f5c8089089
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
am: fecd7c1c1a
am: ad8685a28e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I7a16c8e1c2a6e397cc14fe92a8d7cd02708d24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 20:43:42 +00:00
Gil Cukierman
ad8685a28e
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
am: fecd7c1c1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I52b1fba91b6d25b5b02d94d9ae3fd9cf307cb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 20:16:03 +00:00
Gil Cukierman
fecd7c1c1a
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I6ceccc283e4065fb94b2cf0c741905be40b31c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:48:40 +00:00
Eric Biggers
59fcff0931
Merge "Use StorageManager.isFileEncrypted() instead of deprecated methods"
2022-06-13 18:41:26 +00:00
SongFerngWang
e63dfcbd90
[MEP] Modify the comments
...
Bug: 235792308
Test: build pass
Change-Id: Idf0ce19814ce8b23bc1eea864b36815203069f87
2022-06-13 18:24:30 +08:00
SongFerngWang
56e1297abe
Unable to enable the removable esim
...
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.
Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-13 17:49:00 +08:00
SongFerngWang
887bb592c8
Reuse the active esim slot
...
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.
Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
Merged-In: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-06-13 17:48:34 +08:00
SongFerngWang
faf9baf95b
stop show preferred SIM card dialog during sim switch
...
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
Merged-In: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-06-13 17:48:24 +08:00
TreeHugger Robot
8d70c8992d
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
am: 5f50ce04f1
am: 9aa37e4434
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I93f7300bd536511db61b168baf59c2578b0477b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 22:50:35 +00:00
TreeHugger Robot
9aa37e4434
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
am: 5f50ce04f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: If0c6ecb6ae28407e3f8e975ecc992b7581773454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 22:05:21 +00:00
TreeHugger Robot
1b5fd5904d
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
am: 7fb0500aa8
am: f20d28e0c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I251634e96e47dee560b9031f2122893ec8042a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:36:13 +00:00
TreeHugger Robot
4091170456
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Iaa080b1ba55ad24a174edb5907a5b3fe7dd78584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:32 +00:00
TreeHugger Robot
5f50ce04f1
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I03e4dcfe1a635099d1f13026d1d6a9d21b2348a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:05 +00:00
TreeHugger Robot
063e34e53c
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I48f417627a248636a9aecf0b3a25d9f0ce45eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:39:13 +00:00
TreeHugger Robot
45580a02a4
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Ic7f0628f3ef18ee92733fee88e21242a1424c62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:37:28 +00:00
TreeHugger Robot
f20d28e0c3
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
am: 7fb0500aa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I8c69d810b6544dc86f8bf69b6e53214cbd5cc4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:27:55 +00:00
TreeHugger Robot
1c45e9ad72
Merge "Update fingerprint removal dialog strings" into tm-dev
2022-06-10 20:09:03 +00:00
TreeHugger Robot
863843c7b0
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I80e67d73410150349c3501001c3b8d2252dfe4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:38 +00:00
TreeHugger Robot
7fb0500aa8
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I14e635b309b81f636043f550e01e185c4839dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:36 +00:00
TreeHugger Robot
3b2fe3e89e
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I11486349b04ce9af7004e6761e6d419e4892baf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:56:02 +00:00
TreeHugger Robot
f7b4e4adc9
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I6c28e8ad8fc8e97cf1f6c5c290562f7b6dda4821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:54:24 +00:00
Eric Biggers
ff16ec8542
Use StorageManager.isFileEncrypted() instead of deprecated methods
...
Since emulated FBE is no longer supported, isFileEncryptedNativeOnly()
and isFileEncryptedNativeOrEmulated() are the same as the new method
isFileEncrypted(). Replace all calls to these deprecated methods in
this repository with isFileEncrypted().
Bug: 232458753
Change-Id: I95beea86ef771396c2e08f2d6a643fdc629ad89f
2022-06-10 17:42:38 +00:00
TreeHugger Robot
fc45c25296
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev
2022-06-10 17:25:25 +00:00
Neil Fuller
b16b5b5476
Merge "Switch auto time setting to use APIs"
2022-06-10 13:45:07 +00:00
Menghan Li
94f328040d
Merge "Remove obsoleted code: VideoPlayer"
2022-06-10 06:31:05 +00:00
Menghan Li
2312cf96be
Merge "Remove obsoleted code: VolumeShortcutToggleFragmentForSetupWizard"
2022-06-10 06:30:26 +00:00
Jason Chiu
c2ba8566ad
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
am: 80f4582723
am: ed07da032a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Iafe5b31154ded0b325e3a07efa121adffa94211c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:33:06 +00:00
Jason Chiu
ed07da032a
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
am: 80f4582723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I64e5ba41e0bb3deec4607b6642e0f640a8e29f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:05:58 +00:00
Jason Chiu
f26f49a789
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 6780e6ffdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ie8d2fc2fd39a72e6057d1cab6919dbd8c93a91e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:13 +00:00
Jason Chiu
80f4582723
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I46c865b8c61b359254ea8e971c26b0faf09a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:11 +00:00
Jason Chiu
4ec1953a82
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Idf47ad68dd184cf45ce467eeb6be12a30e8c3057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:34:59 +00:00
Jason Chiu
6780e6ffdd
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ied9c640a9a3586efa78eb1456234cbfac44904fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:33:22 +00:00