Bonian Chen
0726f263a8
[Settings] Rollback group UUID merging in SIM settings
...
Within origin design, subscriptions with same group UUID
are not merged together.
This is a fix which changing grouping by UUID part into a configurable
option which allows to be enabled in some other conditions.
Bug: 191228344
Test: local
Change-Id: I0101f4a51ec2342f059762f0e7d38bb4e93554cf
2021-07-12 14:59:28 +08:00
Marie Matheson
d488fa4147
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 7ec590a5a1
am: 1d0ed65b74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: I183ecf26980465d263a03057dbeca14c29168798
2021-07-07 12:14:36 +00:00
Marie Matheson
9527cc88e4
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 5023e5613b
am: 701bd282da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: I5a94388fe863fa2558ff3af3fc71f4dcbd8e78d6
2021-07-07 12:14:23 +00:00
Marie Matheson
1d0ed65b74
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 7ec590a5a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: I3be513c16a88c1cdfaa596f9963bdbcabac27f92
2021-07-07 11:57:09 +00:00
Marie Matheson
701bd282da
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 5023e5613b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: Ie1750933714536ce74a3ad79ed4c40e6268d6650
2021-07-07 11:56:45 +00:00
Marie Matheson
6d2b782514
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
am: 8b8ddb89e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: Ic3abb93f3e2bdce1bb04dcb806b49c3233c07665
2021-07-07 11:55:55 +00:00
Marie Matheson
5023e5613b
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: If2147c505c13263f6799d250d70cc437ff0a1c95
2021-07-07 11:40:14 +00:00
Marie Matheson
8b8ddb89e6
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: Ibb671b4ef501681f80aa9fafee7b02716b269179
2021-07-07 11:39:21 +00:00
Marie Matheson
7ec590a5a1
Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010
Change-Id: I2a5163c23c36b1a6804e3953f505d6f86c0fb5ac
2021-07-07 11:39:18 +00:00
Marie Matheson
67c5c5a58e
Merge "Move work profile security settings to bottom of list" into sc-dev
2021-07-07 11:29:22 +00:00
Bonian Chen
a229b29737
Merge "[Settings] Settings within each SIM not been displayed to the user"
2021-07-07 09:03:45 +00:00
Marie Matheson
aeafb02074
Move work profile security settings to bottom of list
...
Bug: 192540530
Test: atest SettingsUnitTests
Test: make -j80 RunSettingsRoboTests
Test: Tested manually with and without work profile
Change-Id: I29f43202f71388c991948953c3d2c955fd32627e
2021-07-07 09:02:32 +00:00
Rubin Xu
536a3d1be4
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 91f11c9733
am: 84dda30120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I527a9296982417be35d1fb45337f3101219e3dd7
2021-07-07 08:13:19 +00:00
Rubin Xu
4c3af5c566
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 973b5cf127
am: efe2e53ba4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I0b60eca820cb01c63f673250ac5e17c02d321dd8
2021-07-07 08:13:13 +00:00
Rubin Xu
84dda30120
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 91f11c9733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I9583444f4c94d25e28185179fd008c8db41f35f7
2021-07-07 08:07:07 +00:00
Rubin Xu
efe2e53ba4
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 973b5cf127
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I31e4dbb192e3a78a9deb137700979b5a78ddc8cf
2021-07-07 07:58:55 +00:00
Rubin Xu
0efe3ae03d
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
am: 841a92e9dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I5ce115f3a382c7d53cbf8168e1c39ad3eb978618
2021-07-07 07:58:07 +00:00
Rubin Xu
91f11c9733
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I3da274cfa41a19528df5f736093abf1f17995e8d
2021-07-07 07:50:37 +00:00
Rubin Xu
973b5cf127
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I7dba6fecb8246296a02d38e27316e9256a9cd8c1
2021-07-07 07:49:43 +00:00
Rubin Xu
841a92e9dc
Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137
Change-Id: I7d5f0798ef53751be363f2d8df44b14a8c7a3d7c
2021-07-07 07:49:42 +00:00
Rubin Xu
3e84dd2783
Merge "Delay gargabe collection during onDestroy()" into sc-dev
2021-07-07 07:29:06 +00:00
Linus Tufvesson
c96f60e0cb
Merge "Make WifiDppEnrolleeActivity launches explicit"
2021-07-07 07:18:59 +00:00
Bonian Chen
8e3ff612d2
Merge "[Settings] Hide subscriptions not existed within device"
2021-07-07 07:03:10 +00:00
Bonian Chen
75f1450bbf
[Settings] Hide subscriptions not existed within device
...
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.
Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.
Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
2021-07-07 07:02:55 +00:00
Zoey Chen
529c8e3f71
Merge "[Povider Model] Fix string in SIMs"
2021-07-07 02:27:47 +00:00
Bonian Chen
e0a6c08dce
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: faf07387ef
am: be67d3ca67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I93930f6ed1ed943fbc6690701bc52c1c4b8c3821
2021-07-06 16:22:01 +00:00
Bonian Chen
d6b5c7add2
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: 601ee61c43
am: 2f2691216a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I347e67cd10bc7523c3249a555452cf3c5de1f652
2021-07-06 16:21:55 +00:00
Bonian Chen
be67d3ca67
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: faf07387ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: If7af800edc45e6d189dca9b1b1494c40f76b3fdf
2021-07-06 16:13:43 +00:00
Bonian Chen
2f2691216a
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: 601ee61c43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I109cc8d35611b2bd08e359dee38cc74f5abb7aa0
2021-07-06 16:13:19 +00:00
Bonian Chen
ac51c3748a
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: 5c297fa5c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I9fc5fa396577e16ffe003108e9147ab2c2f841dc
2021-07-06 16:12:52 +00:00
Bonian Chen
601ee61c43
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: If818cd6fc162dc60c341f37299d4b13fb4dbb816
2021-07-06 15:59:19 +00:00
Bonian Chen
5c297fa5c8
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I7e4610579899c20c741a6c5d40440378a968e148
2021-07-06 15:58:29 +00:00
Bonian Chen
faf07387ef
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472
Change-Id: I9ed2d99f853eb1bfe5382b3addc50bc5d56354f7
2021-07-06 15:58:25 +00:00
Bonian Chen
a415ecb608
Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev
2021-07-06 15:46:37 +00:00
Zoey Chen
84073b9851
[Povider Model] Fix string in SIMs
...
Bug: 192058192
Test: make
Change-Id: I4314802840a4952acf7f090d81ca19ec28b793b2
2021-07-06 21:25:23 +08:00
Bonian Chen
e530d93382
[Settings] fix for Wifi calling settings page crash
...
UI crash reported due to accessing telephony framework API with invalid
subscription ID from SIM. Which comes with multiple reason.
Besides of avoidance of crash, following updates are also required:
1. Close wifi calling settings UI when pSIM or eSIM not available or
inserted.
2. Keep the selection of tab (under multi-SIM) when screen rotate
3. Only show 1 SIM when multi-SIM are grouped together
Bug: 149190278
Test: local
Change-Id: Ied9a088b6ee5da66972f27649cc07f4a31304f17
(cherry picked from commit fbe1293a54
)
(cherry picked from commit 05f29efe34
)
2021-07-06 12:38:45 +00:00
Linus Tufvesson
59c0a7bc63
Make WifiDppEnrolleeActivity launches explicit
...
Bug: 180518134
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppUtilsTest\|WifiDialogActivityTest
Test: Manually verified b/180518134 attack is no longer possible
Change-Id: I8c4e1e17117582c78671d0e4658bd87715a9a046
2021-07-06 12:09:10 +00:00
Menghan Li
131a4abef4
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: c3213928cd
am: c1dd1db8c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: I0b9f175174e640715d23f08d150d285945f69fc6
2021-07-06 10:48:06 +00:00
Menghan Li
40073df9bc
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: 99145e9e34
am: f10b91a731
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: I64260d12de2d95446020058d6d98f04e05edbb52
2021-07-06 10:47:57 +00:00
Menghan Li
c1dd1db8c6
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: c3213928cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: Icf520849463dd447775d3d8e96c8a92a8157548b
2021-07-06 10:37:21 +00:00
Menghan Li
f10b91a731
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: 99145e9e34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: Iad06e7f8fda4f287dd70855cdb7cafb71cb43a31
2021-07-06 10:36:59 +00:00
Menghan Li
9e3f26eb29
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
am: 1609504fa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: Id50be66c826b6fa8d4e910b07ecc1ef8d36dc305
2021-07-06 10:36:33 +00:00
Menghan Li
99145e9e34
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: If3d364cee22fbaf7d0c42bae05044add58bece8e
2021-07-06 10:25:11 +00:00
Menghan Li
1609504fa3
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: I5b0f257d4d7b5b77f1fad721795809d482beaee1
2021-07-06 10:24:20 +00:00
Menghan Li
c3213928cd
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev am: 5f0fe5e6c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207793
Change-Id: I5a770f682e6c8e48f854fb54c5e06dce1e7d931e
2021-07-06 10:24:19 +00:00
Menghan Li
5f0fe5e6c1
Merge "Fix toggle display and preferen style old style and barely seen in “Vision Settings”" into sc-dev
2021-07-06 10:07:52 +00:00
Treehugger Robot
5dfa9cde19
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
am: 4909b81006
am: b6e44d16ac
am: 957ece6934
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: I159684580a0f018e7d41dc2982c7d7001e88cf55
2021-07-06 09:15:20 +00:00
Treehugger Robot
957ece6934
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
am: 4909b81006
am: b6e44d16ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: Id4648f0fffbb40b8f854cf93dae300f2f923802e
2021-07-06 09:03:59 +00:00
Treehugger Robot
b6e44d16ac
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
am: 4909b81006
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: I257c6806afcef6211eedc8cf60829f90930a0d32
2021-07-06 08:52:25 +00:00
Treehugger Robot
4909b81006
Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952
Change-Id: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
2021-07-06 08:24:55 +00:00