PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,226 Commits 1 Branch 0 Tags
509c6a4896e4fa0c5ec20141ea73cdc53d2c0769
Commit Graph

86226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
509c6a4896 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours am: 3acc39816b -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981

Change-Id: I5d74804a71344343abd92b6994ce1dd1a48451ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:48:19 -08:00
Hao Dong
3acc39816b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 931b100159 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981

Change-Id: I01d93555887586edf46a97488c2b1126bf41b8a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 12:24:33 -08:00
Hao Dong
dc418ca7bf [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410

Change-Id: I37c51756eb2c8edd9ab4bac58210ada15acf502f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 11:10:42 -08:00
Hao Dong
717ffa9a1b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: c70e6bf477 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410

Change-Id: Ia08a93b5cc97925c3411caa8bc362511d26f2fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 11:10:39 -08:00
Hao Dong
aad0b6827b Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev 2025-01-09 10:37:25 -08:00
Hao Dong
a0b42f7f95 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev 2025-01-09 09:03:17 -08:00
Hao Dong
417970a8ca Set class name when createConfirmDeviceCredentialIntent() API is used. 
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
 2025-01-08 23:08:00 -08:00
Treehugger Robot
b937941549 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev 2024-12-03 20:21:34 +00:00
Treehugger Robot
2112cc5ef9 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: Ic50acb869e087908f40a44f2701d1a7c6c7a96d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:44 +00:00
Adam Bookatz
d5e5daf68e [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I1a9ae19f5ecee037bbb6e471ce175c1b4a53643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:38 +00:00
Treehugger Robot
24dc9f533a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Ied614224826efe4e3dda2bcc6b4b9b3e8b704905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:18 +00:00
Adam Bookatz
1a45fcee73 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208

Change-Id: Ic6bdcdeaea0d4e7074f4469281126d33315abc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:11 +00:00
Treehugger Robot
ad1e470fc0 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: I061448f1d049252139864636361c59710659f2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:42 +00:00
Adam Bookatz
9d81e7d2e5 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387

Change-Id: Ic5289feb780f3de57608de58b86d7250da337727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:39 +00:00
Treehugger Robot
8cfbd8aa9b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev 2024-12-03 19:57:12 +00:00
Treehugger Robot
ead69f3d43 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev 2024-12-03 19:31:03 +00:00
Jason Chiu
f45744f85b Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4bc am: 13b1a03e27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372

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

Change-Id: Ica809bd3cb36961d20c5fd0f8dd035f6f7169a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-25 04:05:17 +00:00
Adam Bookatz
44a35ac07b Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:46 +00:00
Adam Bookatz
6f1c499e57 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:36 +00:00
Adam Bookatz
4901c86b76 Don't let profiles open the UserSettings overflow [DO NOT MERGE] 
Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
 2024-11-19 19:27:33 +00:00
Jason Chiu
d782f9c4bc Block the content scheme intent in AccountTypePreferenceLoader 
Also prevent intent defined in AccountPreference from leaking access

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:45:58 +00:00
Treehugger Robot
87a47bad19 Merge "Disable factory reset in DSU mode" into sc-v2-dev 2024-10-31 16:08:11 +00:00
Treehugger Robot
8009906cb6 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447

Change-Id: Idcc24125f545e6d99c7485371203fb8953db3566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:07:44 +00:00
t
c2513dc8d0 [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours 
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447

Change-Id: I6696719e4052fc9446ceb4648986038750483961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:07:38 +00:00
t
fc128d434f Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430

Change-Id: If07b596780bae7445dc86e32e94f8f0a65bd0e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 16:06:59 +00:00
Treehugger Robot
93b2db6351 Merge "Disable factory reset in DSU mode" into sc-qpr1-dev 2024-10-31 15:59:47 +00:00
t
d1f90f717a Disable factory reset in DSU mode am: 4296cc1977 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430

Change-Id: I3030c76274a9a9f48b784d23a5af5fc73deef870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-31 15:46:28 +00:00
t
a2741a76cb Disable factory reset in DSU mode 
Bug: 302317901
Bug: 316578327
Test: build

Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
 2024-10-25 06:34:19 +00:00
t
27619dd45c Disable factory reset in DSU mode 
Bug: 302317901
Bug: 316578327
Test: build

Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
 2024-10-25 06:34:08 +00:00
t
4296cc1977 Disable factory reset in DSU mode 
Bug: 302317901
Bug: 316578327
Test: build

Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
 2024-10-25 06:33:59 +00:00
Hao Dong
c70e6bf477 Set class name when createConfirmDeviceCredentialIntent() API is used. 
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
 2024-10-16 23:01:40 +00:00
Hao Dong
931b100159 Set class name when createConfirmDeviceCredentialIntent() API is used. 
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
 2024-10-16 22:47:35 +00:00
Guojing Yuan
c45030ba4b [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247

Change-Id: Id7576ad8435bf12972833f0ed056a6edf991b77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-15 18:45:15 +00:00
Guojing Yuan
268575fb3a [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247

Change-Id: I26b92140443f28084cb514da60e1febcf599dfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-10-15 18:25:14 +00:00
Guojing Yuan
59cdc3e20c [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-15 17:14:05 +00:00
Chris Antol
97e33fc9a9 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759

Change-Id: I43d7093fa9512fbf38e972dffa17d233a45154bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:29:18 +00:00
Fan Wu
7eb7f4d12b [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759

Change-Id: If1d39346ff8361175b9f2f91bd7d882061bfb8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:29:14 +00:00
Chris Antol
f927599ebb [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours 
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 0c72cfad1e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759

Change-Id: Id7dfc9f2ac8882a6422f977f1a9886ce289ce0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:19:21 +00:00
Fan Wu
14ef364e16 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours 
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 0c72cfad1e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759

Change-Id: Ic016c44ef51b744cec67df108327540a60293e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:19:17 +00:00
Chris Antol
b611ef7be9 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-qpr1-dev am: ac3b33c26d -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29011110

Change-Id: I941f4aebc6e7605cfd6a5f3257bd427795e8d76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:19:09 +00:00
Fan Wu
de85b9a13c [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 0c72cfad1e -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29011110

Change-Id: I9b9d5ef6c3a7777a486bde95349a641f10389c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:19:05 +00:00
Chris Antol
fabc3ec631 Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev 2024-09-05 03:07:30 +00:00
Chris Antol
ac3b33c26d Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-qpr1-dev 2024-09-05 03:07:30 +00:00
Chris Antol
d6ee2d0a98 Merge "Checks cross user permission before handling intent" into sc-v2-dev 2024-09-05 03:07:30 +00:00
Treehugger Robot
a1fea68952 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: I9695aa42a1713b803f4cf1b72f5ae308eee62a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 16:38:58 +00:00
Treehugger Robot
72e4718e69 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: Ife0d68f9156a3ff6ffd1f08b2d58bf9741a734f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 16:29:04 +00:00
Treehugger Robot
5e94bcbb1d Merge "startActivityForResult with new Intent" into sc-dev 2024-09-04 16:26:10 +00:00
Fan Wu
ff4daf4bf4 Checks cross user permission before handling intent 
Bug: 326057017

Test: atest

Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35)
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
 2024-08-29 17:38:13 +00:00
Fan Wu
7d2552bf93 RESTRICT AUTOMERGE Checks cross user permission before handling intent 
Bug: 326057017

Test: atest

Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35)
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
 2024-08-29 17:35:06 +00:00