Commit Graph

19201 Commits

Author SHA1 Message Date
Jason Chiu
26e1224ea6 Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034 am: b5bf33ab76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469374

Change-Id: I403257d71d74f78cc7166af1c2f940200599b953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 04:29:32 +00:00
Jason Chiu
b5bf33ab76 Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469374

Change-Id: Ibc5350fee27a89cdf02d82d24bf4834931de4c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 04:04:39 +00:00
Jason Chiu
8fa1dcb034 Block the content scheme intent in AccountTypePreferenceLoader
Bug: 366401629
Flag: EXEMPT security fix
Test: atest AccountTypePreferenceLoaderTest, manual
Change-Id: Ica87087341cc983df04190919e33dc369fa18619
Merged-In: Ica87087341cc983df04190919e33dc369fa18619
(cherry picked from commit 841fb3846b)
2024-11-19 10:47:06 +00:00
Guojing Yuan
edf497802d [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106

Change-Id: Ic894c297273b36c0df8c9a9055cdd24e40306f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 21:59:55 +00:00
Guojing Yuan
e4fe2f5b81 [CDM][NLS] Check if the NLS service has an intent-filter
Bug: 363248394
Test: CTS
Flag: EXEMPT bugfix
Change-Id: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
Merged-In: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
(cherry picked from commit 7ae59a42eb)
2024-10-04 22:50:07 +00:00
Yiling Chuang
4d263156f8 RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724 am: eae022088f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763

Change-Id: I223966ef871fa55ecc5a53643f0479327978fe33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-02 17:17:47 +00:00
Yiling Chuang
eae022088f RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763

Change-Id: Ic394804c1f515b4e9a3fd4fae3df77c8d27b116a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-02 17:01:14 +00:00
Yiling Chuang
2659f8416c RESTRICT AUTOMERGE FRP bypass defense in App battery usage page
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
2024-07-31 07:36:04 +00:00
Yiling Chuang
23b88e0724 RESTRICT AUTOMERGE FRP bypass defense in App battery usage page
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.

Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix

Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079)
2024-07-31 07:18:16 +00:00
Treehugger Robot
ba599569fd [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008

Change-Id: I877be6871e43eb5d42c695b5cdb1faecdbc5305f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:27:49 +00:00
Treehugger Robot
ffb480aee4 [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008

Change-Id: Ic0f5293649e322c4da6bbfcbce8486270436442e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:13:16 +00:00
Treehugger Robot
a339d8ea9a [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546875

Bug: 333364513
Fix: 345375093
Change-Id: Ifdebf7a60f3695f83d8fa04e05f4dbd6e177f62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 02:49:14 +00:00
Jason Chiu
8bdbb580da Replace getCallingActivity() with getLaunchedFromPackage()
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.

Bug: 316891059
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit ddc11bc03a)
2024-05-28 02:40:04 +00:00
Weng Su
981673f940 [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2 am: 3d6b2b688e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831

Change-Id: I7f37ea9867aff063d8a22580d84ab0007abad77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 20:29:43 +00:00
Weng Su
146d51f2cc [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708

Change-Id: I2f57a28bbc46a1f648d6ecf0a72eab3a884e69e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 20:06:34 +00:00
Weng Su
3d6b2b688e [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831

Change-Id: I475d313032f26d9e835f04d4b8f6ed0e03fb4075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 20:06:12 +00:00
Weng Su
254ba087c2 [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG

- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG

Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
         SettingsUnitTests:WifiDppConfiguratorActivityTest

Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 07:50:24 +00:00
Weng Su
0ea027a71c [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG

- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG

Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
         SettingsUnitTests:WifiDppConfiguratorActivityTest

Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 03:52:07 +00:00
Jason Chiu
930a9f3180 Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861

Change-Id: I01598c3f2fa5432dc27357701ddcbb29b4c97776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 04:47:38 +00:00
Jason Chiu
ddc11bc03a Replace getCallingActivity() with getLaunchedFromPackage()
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.

Bug: 316891059
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit 901880a1d2)
2024-02-22 03:43:50 +00:00
Weng Su
2a9ea31fb5 [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74 am: a71eb50f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111

Change-Id: I24369d8ac4ea5ab7bcd699444fdbd086997685b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-04 23:55:44 +00:00
Weng Su
b33f9b8f8a [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282

Change-Id: I95a273524cc758ed7abe08b76ae4b2631a850ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-04 23:20:04 +00:00
Weng Su
a71eb50f99 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111

Change-Id: I29aa05d1b2b3aa43c53d83578fa03be3938bb083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-04 22:59:57 +00:00
Weng Su
a0409e582c [RESTRICT AUTOMERGE] Restrict WifiDialogActivity
- Don't show WifiDialogActivity if user has DISALLOW_ADD_WIFI_CONFIG

Bug: 299931761
Flag: None
Test: manual test with TestDPC
atest -c SettingsRoboTests:WifiDialogActivityTest

Merged-In: Icbb8f45922ded163208976be9c2816060dcf09f1
Change-Id: Icbb8f45922ded163208976be9c2816060dcf09f1
(cherry picked from commit 51fa3d798a)
2024-01-30 21:23:08 +00:00
Weng Su
aabb15de74 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity
- Don't show WifiDialogActivity if user has DISALLOW_ADD_WIFI_CONFIG

Bug: 299931761
Flag: None
Test: manual test with TestDPC
atest -c SettingsRoboTests:WifiDialogActivityTest

Merged-In: Icbb8f45922ded163208976be9c2816060dcf09f1
Change-Id: Icbb8f45922ded163208976be9c2816060dcf09f1
(cherry picked from commit 51fa3d798a)
2024-01-31 05:03:19 +08:00
Valentin Iftime
ef71596281 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651 am: b36b1dab96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Iaa3e61923eddada09aa19b61428ee60630b57cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:18:09 +00:00
Valentin Iftime
b36b1dab96 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5 am: 179f53c651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Ie1a755c491132beee40f05c27f5f25eb52a414c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 00:34:46 +00:00
Valentin Iftime
179f53c651 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7 am: fa932686c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Id029d4fd78881f7e32599f566e79b9640f3b13e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 00:04:54 +00:00
Valentin Iftime
fa932686c5 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac am: a4a9b9f0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: I2ed08af5bb3839d2a19403a6c65fd6c2c6ccce9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:49:38 +00:00
Valentin Iftime
a4a9b9f0e7 Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17 am: 623d966fac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Iaa926f8a61ba0c6e4d6511750b3e1dfe83627037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:32:36 +00:00
Valentin Iftime
623d966fac Validate ringtone URIs before setting am: 7ba175eaeb am: 236f1a0f17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Ifcec90852c0369ee58dabfd2fb9cf4f45fc2e2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 20:13:12 +00:00
Valentin Iftime
236f1a0f17 Validate ringtone URIs before setting am: 7ba175eaeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689

Change-Id: Id2d5f2423cacd7e4bb06fe46e1773b512a79fc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:22:51 +00:00
Treehugger Robot
8f3d594305 Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: Idefa9ae0fd0a1bbd2353d518307bf32369c1f21b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 18:46:03 +00:00
Valentin Iftime
1876c44991 Validate ringtone URIs before setting
Add checks URIs for content from other users.
 Fail for users that are not profiles of the current user.

Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
Merged-In: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-09 12:59:16 +00:00
Valentin Iftime
7ba175eaeb Validate ringtone URIs before setting
Add checks URIs for content from other users.
 Fail for users that are not profiles of the current user.

Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
Merged-In: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-09 12:55:39 +00:00
Weng Su
f869bfa55f [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008

Change-Id: Ia2f6bfa237d211be6b884c56d831c84d0c437210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 00:13:52 +00:00
Wenhui Yang
5239911c6b Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev 2023-07-26 02:44:08 +00:00
Weng Su
cb3ebcb4e3 [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017

Change-Id: I9a94483eaa6693a50ee2d01264ad202721b80986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:45:45 +00:00
Treehugger Robot
57b00e28ea Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:59:46 +00:00
Wenhui Yang
d26f18f727 Revert "Fix rotate device at face unlock detailed page, device will display"
This reverts commit 2ca753bd06.

Reason for revert: Fix b/289173795

Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
2023-07-25 20:31:36 +00:00
Weng Su
5c2d727b8f [RESTRICT AUTOMERGE] Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-12 11:30:45 +00:00
Weng Su
bd5e3c0c05 [RESTRICT AUTOMERGE] Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Merged-In: I5cf984000244b4ad901c6a4977a1368279323e0a
2023-07-12 07:05:37 +00:00
Weng Su
ef2fd5b7cd [RESTRICT AUTOMERGE] Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Merged-In: I5cf984000244b4ad901c6a4977a1368279323e0a
2023-07-12 06:46:21 +00:00
Weng Su
e3b554b296 [RESTRICT AUTOMERGE] Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-11 08:35:17 +00:00
Weng Su
6afcad7626 [RESTRICT AUTOMERGE] Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-11 08:34:53 +00:00
Chaohui Wang
fe38ff963a Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev 2023-07-11 07:50:49 +00:00
SongFerng Wang
717ce2b91f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev 2023-07-11 04:55:18 +00:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
2023-07-10 14:20:07 +08:00
Chaohui Wang
590b4e7af8 [Regulatory Labels] Load labels from overlays
When config_regulatory_info_overlay_package_name is configured, load
regulatory labels directly from overlay package.

Also fix RegulatoryInfoDisplayActivity missing dialog theme.

Bug: 283170651
Test: unit test
Test: manual - check regulatory labels
Change-Id: Ia1f6848abe0da9facf34f47abab09e88d57e74d6
2023-07-07 14:52:26 +00:00
Weng Su
5a17d39db7 Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2)
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 12:11:33 +00:00