TreeHugger Robot
e6e739d8b0
Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Change-Id: I5ebae8947d883130b93c9a82d087656dab41498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 12:58:31 +00:00
TreeHugger Robot
74ff164972
Merge "Prevent exfiltration of system files via user image settings." into qt-dev
2022-04-01 12:42:31 +00:00
Weng Su
c422d95147
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: I7ba4a451a493b9d4df278f7aee6bfbacc9bf2322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:47:33 +00:00
Weng Su
ec1b6c308a
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236
Change-Id: Ib5462706a20ca6565144faae9c5009939bf2eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 08:28:28 +00:00
Weng Su
c68e241fa6
Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation"
2022-04-01 08:08:51 +00:00
Treehugger Robot
3fb5213538
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
am: a1a5091f12
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: Ida0dd5521a0bf94599315658b70c14a058295585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:36:46 +00:00
Treehugger Robot
a1a5091f12
Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445
Change-Id: I854bc6abd439b952f15627ea1859176c4b0665aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 07:13:19 +00:00
Treehugger Robot
0159ca5d9c
Merge "Settings: Fix cellular internet option Not seen after internet reset"
2022-04-01 06:52:44 +00:00
Treehugger Robot
caa0bbd931
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Iffb14760e676a66d061f500a1e9fc383c2a317e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:01:14 +00:00
Treehugger Robot
3531a34760
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Id3a72177089ca58c1e8e092220835dd3e5f41064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:44:08 +00:00
Treehugger Robot
f558fc27d9
Merge "Settings: Fix WifiSettings FC when rotating screen"
2022-04-01 01:23:47 +00:00
Quang Luong
6ca8dd1b1a
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: I50e3649c21bb83ee9130fa98a71560fe261198a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:45:25 +00:00
hoffc
0991b39ed3
Settings: Fix NPE FC when access saved wifi p2p device after screen rotation
...
Rotating screen, wifi p2p setting fragement will be re-created and the selected wifi p2p device will be saved in onSaveInstanceState. However, now this saved wifi p2p device is restored in onActivityCreated, this is too late. So when getting this saved wifi p2p device return NULL in onCreateDialog and leads to NPE force close.
Restore the saved wifi p2p device in onCreateView instead of onActivityCreated.
Bug: 220025725
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I9b746e21f7f3651c69b1445f2389c089ec19319c
2022-03-31 06:52:37 +00:00
hoffc
5710b02972
Settings: Fix cellular internet option Not seen after internet reset
...
Cellular internet preference will be hidden during reset internet, and resume to be visible after successfully reset or reset timeout. Due to the wrong immediately param value assigned for hidePreference method, which results in cellular internet preference not seen after internet reset.
Assign correct immediately param value when resuming after internet reset.
Bug: 224893326
Test: manual test
atest InternetResetHelperTest
Change-Id: I3f8d5dd9de2a56ecfe201483ee8a95b379e8fe65
2022-03-31 04:01:58 +00:00
hoffc
f3fe5cf197
Settings: Fix WifiSettings FC when rotating screen
...
Rotating screen will trigger wifisettings re-creation. Force close occurs If receiving wifi picker tracker callback during activity finishing.
Bug: 218411211
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Change-Id: I06d251a8a12d3f8785db24ead0abe31c0f34cc9b
2022-03-31 04:00:52 +00:00
Quang Luong
baf2ef0be6
Do update signal icon for -1 level in AddAppNetworksFragment
...
The level of a WifiEntry may be -1 (WIFI_LEVEL_UNREACHABLE) due to race
conditions. Thus, only update the signal icon if the level is a valid
value [0, 4]
Bug: 201488249
Test: m
Change-Id: I87f1c108d262bb5a7575c9ad434d2cfb953134af
(cherry picked from commit 9d66b22ee0
)
2022-03-30 21:48:31 +00:00
Weng Su
4026f4134f
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I17625880bf59eb632cc0dcdbc222c60a516d119e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:40:51 +00:00
hoffc
6771edae5c
Settings: Fix sometimes reset progress dialog not dismissed
...
The display of reset progress dialog takes time. User can initiate multiple clicks and show multiple progress dialogs during the internal. But in fact, only once dismiss request initiated.
Check the reset progress dialog, if it is showing, dismiss it firstly before show another reset progress dialog.
Change-Id: Ia944990ea489927b38be59b1f7a8ad66fc8b669a
Buganizer: 227413950
2022-03-30 14:28:17 +08:00
Weng Su
7abffe0057
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: If2619c93286363f268bb7021af1037195fcba4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:26:59 +00:00
Weng Su
a30d123e12
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:11:32 +00:00
Treehugger Robot
0818a1c62b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours am: 178ba3e57d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: Id2d06b535518562830aeaed8b0f9f647e202ee68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:02:14 +00:00
Bill Yi
2b1435d300
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21
-s ours am: 5f55cb2ed8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: Ib485ceb1142d2e15bc2541fda0850a9cd02b40cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:02:13 +00:00
Treehugger Robot
c5142845f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276
-s ours am: 3ad321509f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I327ae4de3c8675c2da6a735ef6cadcf3310b6976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:01:19 +00:00
Bill Yi
e68d843167
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628
-s ours am: b28c27e68e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: Id571c60c7cf39d4f4327e67e692e1fe6ad73bae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:01:18 +00:00
TreeHugger Robot
0e536d93b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: Icd818627964fd287182375db9e2e91789a885c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:51:36 +00:00
Bill Yi
cc3a93e23b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: I977992bbe1a5875e6827128bb3495afee8d71a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:51:34 +00:00
Treehugger Robot
178ba3e57d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I9969ee7d5bb026824736ebbba3c43c18f2343e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:45:52 +00:00
Bill Yi
5f55cb2ed8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I765e946f2e8e04370891f50fa42bcde6fe424c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:45:51 +00:00
TreeHugger Robot
2703c29227
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: I3a2febfb3742ac359a86226e0f1cc6a964ec8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:45:06 +00:00
Bill Yi
620782b9d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: Iabad895ae533c8779bc8bc3f9330a520fae7f967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:44:52 +00:00
Treehugger Robot
3ad321509f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: Ie231da55ce887649cc28e0fec042b24b109d9379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:43:36 +00:00
Bill Yi
b28c27e68e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I031a74875cddf5b00bebfbf1d23b5afc9c1fe7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:43:25 +00:00
TreeHugger Robot
97539de67e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-03-28 06:27:30 +00:00
Treehugger Robot
d35c876857
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-03-28 06:24:36 +00:00
Treehugger Robot
65c7ff0276
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-03-28 06:23:23 +00:00
TreeHugger Robot
4d9878828e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-03-28 06:20:17 +00:00
Peter Wang
4f5dbc4db4
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400637
Change-Id: I9f9a7264dd55407f429898be56a08f7b3682eea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 05:32:04 +00:00
Peter Wang
0ab2226dff
Add a cancel string for ToggleSubscriptionDialog to handle Tamil
...
translation
Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
(cherry picked from commit 6879183335
)
2022-03-28 05:21:36 +00:00
Sarah Chin
61ec9b6d70
Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
am: 9b9c5f2f93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: Ic9802f7cfe88ea35afc0209fceb7666e6ee8b9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 05:17:02 +00:00
Sarah Chin
9b9c5f2f93
Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: I66f96ad433720d92b3c8b0906c4fca1409d281ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 05:11:25 +00:00
Sarah Chin
1abef7542a
Merge "[MEP] Use switchToSub API with pending intent"
2022-03-28 04:58:54 +00:00
Weng Su
4c4a1f58c1
Restrict secondary users to share Wi-Fi network
...
- Remove "Share" and "Forget" options from the long press menu
- Add SafetyNet Logging for security report
Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
Merged-In: Ic434f0583cba557228c72508a501347ffa3141e1
2022-03-28 03:15:18 +08:00
SongFerng Wang
53f68b7f27
Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7
am: b9cd3f7ef9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028
Change-Id: Ie9741186e04bab03be7339f94a789675d12c6360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:38 +00:00
SongFerngWang
2eb57839c6
[MEP] renew the sim confirm dialog UI am: ba9d26696b
am: 04424bbf69
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027
Change-Id: I3b3b17af236799939a4919c67f123005740e1aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:37 +00:00
SongFerngWang
696f538ff3
[MEP] renew the default data selection UI am: db2ddb6a92
am: e9d39b468d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I0b55a215eaa751232ffe69c7cfc16cf713e3d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:35 +00:00
SongFerngWang
0453d9de8d
switch SIM refactor to support MEP am: 59a6ecbde2
am: b29d670c71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: I7592c07952c05765a409b92845379e325697b521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:34 +00:00
SongFerngWang
57fbdab22d
switch SIM refactor to support MEP am: 37358798bc
am: 483ff27a47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I6e35330168e2094e5bb7b9cbcf80574fcfe38773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:33 +00:00
changbetty
4b3a17619e
Support RTL mode in Sim switch dialog am: 562cc5ed45
am: 342fe3487e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023
Change-Id: I2c4120d86f9c27bad0f57df881eddbb97ba9c4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:32 +00:00
SongFerng Wang
b9cd3f7ef9
Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028
Change-Id: I473db94863284e07184f90f6f442d3d405c87e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:46 +00:00
SongFerngWang
04424bbf69
[MEP] renew the sim confirm dialog UI am: ba9d26696b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027
Change-Id: I8a21b5f42cdd0febc75d2b4fca211bb21d8ea084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:45 +00:00