Commit Graph

103582 Commits

Author SHA1 Message Date
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
31e69deb28 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:43 +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
772238abd6 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history

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

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

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

Change-Id: I3284530cc6adc3fc1d5efcf4590579715021b938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:27:16 +00:00
Treehugger Robot
bd29320e54 [automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351 -s ours am: 8009906cb6 -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: I13e0585463f359d309e5b08791d84376c941fd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:26:44 +00:00
t
c3ae6b4ede [automerger skipped] Disable factory reset in DSU mode am: 27619dd45c -s ours am: c2513dc8d0 -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: I421a4dd6ef11d39b8e8370e2f2a3cb982ae82477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:26:39 +00:00
t
7d3a9a197f [automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history

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

Change-Id: Id6c20b26794b08de160a19f30c06b77987e7672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 16:26:25 +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
Howard Chen
692f794e6f Merge "Disable factory reset in DSU mode" into tm-dev 2024-10-24 02:51:24 +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
d4a01ee0db [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I355a696d03b58ea53a4a4a0485878d14eee2314c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:00:44 +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
Hao Dong
2b7c1f1105 Set class name when createConfirmDeviceCredentialIntent() API is used.
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
2024-10-11 03:57:00 +00:00
Guojing Yuan
d440f2ef05 [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:51:57 +00:00
t
d45a07894b Disable factory reset in DSU mode
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-09-05 05:34:25 +00:00
Chris Antol
439a39b81f [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours
am skip reason: contains skip directive

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

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

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

Change-Id: I7068c891b7b16d1f5a31b6d58eabf82a3f722710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:39:21 +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
0523542d74 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-qpr1-dev am: ac3b33c26d -s ours am: b611ef7be9 -s ours
am skip reason: contains skip directive

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

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

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

Change-Id: Ifc65905f5db1cf655fd7d81357fd332baecbfd3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:19:41 +00:00
Chris Antol
b4e56ee1ce [automerger skipped] Merge "Checks cross user permission before handling intent" into sc-v2-dev am: d6ee2d0a98 -s ours
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 c24808f9b6 is already in history

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

Change-Id: I76917098c031670f308379cf083ccc59e59d55c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 03:19:28 +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
be5426cc0b [automerger skipped] Checks cross user permission before handling intent am: ff4daf4bf4 -s ours
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 c24808f9b6 is already in history

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

Change-Id: If9dfd53d75c074c1920948f8489060b40f36509f
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
d6ee2d0a98 Merge "Checks cross user permission before handling intent" into sc-v2-dev 2024-09-05 03:07:30 +00:00
Chris Antol
876787b619 Merge "Checks cross user permission before handling intent" into tm-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
Treehugger Robot
a6755d0734 Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671

Change-Id: Ie2376064867d72868e5fed092bc04c5412b13449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 16:50:02 +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