Hao Dong
77c1c2dce7
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: cf5d961564
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28785157
Change-Id: I1dbad13e3f039e18272579adaf249c37712bbf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 18:19:14 -08:00
Hao Dong
cf5d961564
Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev
2025-01-08 17:38:41 -08:00
Chaohui Wang
a8e4522f8c
Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30341738
Change-Id: I2cb164d28c75c4de511c18548130835570a170c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-04 02:11:14 +00:00
Chaohui Wang
0691d3040b
Merge "[Safer intents] App Time Spent Preference" into udc-dev
2024-12-04 01:27:28 +00:00
Adam Bookatz
eb1e5320e7
Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978
Change-Id: I793ddf2e961045cf0da2e569f55fe8cf8da02aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:16:41 +00:00
Treehugger Robot
31af2ff68c
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev
2024-12-03 19:52:15 +00:00
Jason Chiu
276ca29b31
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: Ib6eb79eee294ac76553b9393c29929e091036153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 04:30:41 +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
Adam Bookatz
6e413c4cff
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:40 +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
Chaohui Wang
e401ea4743
[Safer intents] App Time Spent Preference
...
Set package com.android.internal.R.string.config_systemWellbeing to the
intent.
Fix: 356117796
Flag: EXEMPT bug fix
Test: manual - on App info
Test: atest AppTimeSpentPreferenceTest
Change-Id: I2af7b53a75fe5c6915dd9781406039822789c18c
Merged-In: I2af7b53a75fe5c6915dd9781406039822789c18c
2024-11-11 09:47:24 +00:00
Howard Chen
ccb34dc532
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I08f3ec0c81a3ca01de6ce2513e81a284d8cff062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:51:16 +00:00
Howard Chen
00143bf156
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I3a815a0a9f65ad1814741e58f781301f9b9f6fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:30:08 +00:00
Howard Chen
db47f7bfe8
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: 75a0b01eb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: I4543cb19cedf28eefdc5abebadc09c8ada257a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:29:36 +00:00
Howard Chen
75a0b01eb9
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: If2785ed3b6eb14fd67ee8d045c0d7c2463904ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:13:10 +00:00
Howard Chen
d498d8b580
Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: Ic7af2a8f42525f1bca70b370f0c27a8175cb2a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-24 03:13:08 +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
63eda7f3a9
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:45:47 +00:00
Guojing Yuan
54142da21f
[CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883
Change-Id: I83d612fbcc6ff78dd455ecf30d17d16f99900426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-14 23:19:28 +00:00
Guojing Yuan
120f2345b8
[CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883
Change-Id: I42468b1d2bfb94f7f5645a8e710ed67818a38317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-14 23:01:25 +00:00
Guojing Yuan
760d594cff
[CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883
Change-Id: Iab4e925157e013de4d2a34864856bff0b10ae065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-14 23:01:23 +00:00
Guojing Yuan
a0924c7c6a
[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: I396f1b0749acfad5300f706e62c97a6f136119b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-14 22:00:14 +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
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
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
3c5ec77a90
Merge "Checks cross user permission before handling intent" into udc-dev am: f40bb9bbec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29011113
Change-Id: I58b38c863ecd68459ecff22f7898c8a7070daf44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 03:18:36 +00:00
Chris Antol
738d310091
Merge "Checks cross user permission before handling intent" into tm-dev am: 876787b619
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010757
Change-Id: I073a6af9f360e06d90ab01455273520c20f8cd4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 03:18:32 +00:00
Chris Antol
b15e7be2a9
Merge "Checks cross user permission before handling intent" into tm-dev am: 876787b619
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010757
Change-Id: Icdcfdf068f58ae82842d7e5bb05a7ba5adf244d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 03:18:14 +00:00
Chris Antol
4b72ad7d0d
Merge "Checks cross user permission before handling intent" into tm-qpr-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
f40bb9bbec
Merge "Checks cross user permission before handling intent" into udc-dev
2024-09-05 03:07:30 +00:00
Treehugger Robot
d7c3b58445
Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 am: a6755d0734 am: 38d0889de0 am: 2c4e70c518
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671
Change-Id: I3e6c5b731b13416f4673909deb1578827c3afd68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 17:23:36 +00:00
Treehugger Robot
2c4e70c518
Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 am: a6755d0734 am: 38d0889de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671
Change-Id: Ieed1358c10603d3481e672d8388b96befa0bbca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 17:14:23 +00:00
Treehugger Robot
ae7acf70d8
Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 am: a6755d0734 am: cadbfc0cb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671
Change-Id: I743f48ae10a6c831d53cf0b06a8bfbf82292b11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 17:13:55 +00:00
Treehugger Robot
cadbfc0cb1
Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 am: a6755d0734
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671
Change-Id: Ib8b4501a4f471835708354c281020f0cc57812f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 17:00:10 +00:00
Treehugger Robot
38d0889de0
Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d am: 72e4718e69 am: a1fea68952 am: a6755d0734
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671
Change-Id: I3222988b72efd562f2215217c764962e4eec814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 17:00:07 +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
Treehugger Robot
5e94bcbb1d
Merge "startActivityForResult with new Intent" into sc-dev
2024-09-04 16:26:10 +00:00
Fan Wu
20024f00a5
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:33 +00:00
Fan Wu
c24808f9b6
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:37:49 +00:00
Fan Wu
964908bc14
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:37:08 +00:00
Daniel Norman
1a28bf00d3
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I8d823e7b82a69e924adcc6559289aeb4f46cce04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:22 +00:00
Daniel Norman
41efccc461
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ibd262d1e500113d0b29fae776cc950610dcc02db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:47 +00:00
Daniel Norman
2652cb6236
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176
Change-Id: I0894ff7c5c10128c096a8a9d161b8e53607a7c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:19 +00:00
Daniel Norman
51113ad5ef
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I701845d7ff26c82b6dda7894e9597bb8929aaf86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:11 +00:00
Daniel Norman
4139b9fa1e
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I312e63382e673d3f2661dbf0a82e8181c8aaa6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:07 +00:00
Treehugger Robot
5d2e307f6e
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev
2024-08-22 00:03:59 +00:00
Daniel Norman
25ecee0563
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity.
...
Bug: 353700779
Test: Install poc APKs from the bug, observe issue not reproducible
Test: (automated tests on 'main' branch)
Flag: NONE security fix
Change-Id: Ia8d43229d277dd4442173166ae0402f05096da4b
2024-08-14 21:20:10 +00:00