PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,470 Commits 1 Branch 0 Tags
f2e95596f7d1fbddbfafcc2e93e7f4dcb8a02b45
Commit Graph

104470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
46c8caa6cc [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Ib323120650a042e24732c749b6b5521894299af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:30:29 +00:00
Yanting Yang
9038a26635 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

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

Change-Id: I7cfb933ca1c82100996120520e228e765955d7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:59:56 +00:00
Yanting Yang
adc9a200ac [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Id63a2ff11919abe62c0dbcaa5fbe17f10212ce89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:59:49 +00:00
Yanting Yang
6326f5e65a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

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

Change-Id: I390e1a3a8d8c683c604724571459ba7ebeccaf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:56:12 +00:00
Yanting Yang
accde42e7d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I6dc5bcd9b40c5f565ec370ca99cea68a5d4ea528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:43:31 +00:00
Yanting Yang
615f13120c [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I98957aa0f4c8108d6cad7b3beb4bef5a47821a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:43:26 +00:00
Yanting Yang
f3d990e36d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

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

Change-Id: I3a56150f056da9c1ecd77ea2e97d3196a0ca811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:24:05 +00:00
Yanting Yang
1b30190fe1 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Id6ea47451afaeccfa879791583a880c1986acc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:59 +00:00
Yanting Yang
3594b1e412 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

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

Change-Id: I1b23667c48d00bb5e33cd2d3f96ee6ba3d0ee438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:36 +00:00
Yanting Yang
3fefcb236a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: Ieac19e01cf73c5861992714c7602e4c88ea87c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:31 +00:00
Yanting Yang
f54f57f1a7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I3ee17f055872b9ad8929c3a07f70a12646040939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:10:14 +00:00
Yanting Yang
33186e2f03 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I45654cc46309d8051f06a0b6082d38a04e612196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:06:36 +00:00
Yanting Yang
5dbaf208f0 Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871702

Change-Id: Ic9875331fa1a63feee2d51c4782e8c98df882794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 02:34:52 +00:00
Yanting Yang
86914bedc8 Add DISALLOW_APPS_CONTROL check into uninstall app for all users 
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
 2023-01-04 18:59:18 +00:00
Yanting Yang
1a43a98334 Add DISALLOW_APPS_CONTROL check into uninstall app for all users 
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
 2023-01-04 18:58:32 +00:00
Yanting Yang
16500a7ada Add DISALLOW_APPS_CONTROL check into uninstall app for all users 
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
 2023-01-04 18:56:58 +00:00
Yanting Yang
0616b484e9 Add DISALLOW_APPS_CONTROL check into uninstall app for all users 
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
 2023-01-04 18:56:09 +00:00
Yanting Yang
9191ec13e2 Add DISALLOW_APPS_CONTROL check into uninstall app for all users 
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
 2023-01-04 16:21:24 +00:00
Yanting Yang
22e4eebafe Add DISALLOW_APPS_CONTROL check into uninstall app for all users 
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.

To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.

Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
 2023-01-04 16:16:34 +00:00
Tsung-Mao Fang
e531e8e79f [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours am: 6800574d8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65a05b9b91bd9960353cd665ff7d511c8e5f7db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 04:30:51 +00:00
Tsung-Mao Fang
8ab6eb1be3 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours am: d9b063c4a8 -s ours am: 8c9e74c6c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfdb6511df114a8f1677a61adf4214d80dff13ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 04:30:41 +00:00
Tsung-Mao Fang
6800574d8d [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours am: 322e0d684d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idaa448d3fe509febe2c183d3919de06723432a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 03:56:33 +00:00
Tsung-Mao Fang
8c9e74c6c1 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours am: d9b063c4a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cc9e28d5c9c22cbfc4394a9fdc1214b8ac06c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 03:56:22 +00:00
Tsung-Mao Fang
322e0d684d [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours am: a5904fed59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia726a7ef8c5b01d38600a55156195e9e717afb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 03:27:43 +00:00
Tsung-Mao Fang
d9b063c4a8 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours am: e57ce41bf1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2cffee6eed121dbf8b581eff8eb1c848c1eae78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 03:27:36 +00:00
Arc Wang
9ab2f7b65b [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours am: 57643513e3 -s ours am: 8cf511b709 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: Ie4a72b916f5ccaeafa234150f6619c2666e03719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:55:34 +00:00
Tsung-Mao Fang
f70458cdd9 [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours am: ee39631cdb -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I9497386a645e3fe4817da89ce597a6dad00dc7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:55:33 +00:00
Tsung-Mao Fang
5fd32e90b6 [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours am: 0f05806ab5 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: Iba760e28f5d6dde8384873f171544772a5af2318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:55:26 +00:00
Arc Wang
ecf1846617 [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: Ic02f075561163bbe76ec94cea2640e1bbdee5915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:55:19 +00:00
Tsung-Mao Fang
38ee0a345a [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: Id0a41a267ae5106ed4fc236500c92a949f1f7f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:55:18 +00:00
Tsung-Mao Fang
a5904fed59 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours am: ac092ac06f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I457040da17e352a4d1cee1453e11daeffb1f5eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:52:16 +00:00
Tsung-Mao Fang
e57ce41bf1 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours am: c923d29c08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19e026e0dccec0e45dbc02fb926fda24c3c45f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:52:10 +00:00
Arc Wang
8cf511b709 [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours am: 57643513e3 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I8bf03238620201496af8077768303e1fbbdb16d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:36:24 +00:00
Tsung-Mao Fang
ee39631cdb [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours am: fc17db496f -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1d1009c07ea93deac60efb8fc1467bf95f074a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:36:21 +00:00
Tsung-Mao Fang
0f05806ab5 [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: Ibe913743375e295c5fcc2e2acbbc4f90f8c65eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:36:12 +00:00
Arc Wang
57643513e3 [automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I1462714a0484f6a2dc310a9a8b079a6a7bac0e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:21:28 +00:00
Tsung-Mao Fang
fc17db496f [automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 am: 1ebb665b71 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019 is already in history

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

Change-Id: I02b849dc2f0705021a168985057ff725c9b9f415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:21:27 +00:00
Tsung-Mao Fang
9764e1f9fd [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa is already in history

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

Change-Id: Iaa0029076d6b0eb1960b3a7c2d6abc49316e1b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:21:08 +00:00
Tsung-Mao Fang
ac092ac06f [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours am: 4332b3266e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie83ac1cc02b260d9468438076e8ca8ff11e72a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:17:51 +00:00
Arc Wang
eeafd49d4e [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: I07c9886a2bceaab3eccf3e1690ced01118240717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:17:41 +00:00
Tsung-Mao Fang
b8fd889067 [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history

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

Change-Id: I326f27db0a1247719b08e84597051477baad4266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:17:37 +00:00
Tsung-Mao Fang
c923d29c08 [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31163255a4a53af7b3473067afbd6e21ba11147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:17:33 +00:00
Tsung-Mao Fang
4332b3266e [automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8 -s ours 
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 b34ff2f272 is already in history

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

Change-Id: Ia867eecc252f5bc5e95e2fd49e2802e9f1d413dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-04 02:17:27 +00:00
Arc Wang
4b12201ec4 Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev 
* changes:
  [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
  FRP bypass defense in the settings app
 2023-01-04 01:52:01 +00:00
Arc Wang
9a6c84c47e Merge "FRP bypass defense in the settings app" into sc-v2-dev 2023-01-04 01:51:22 +00:00
Yasin Kilicdere
2ecf96a422 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev 2023-01-03 12:18:58 +00:00
changbetty
0dcd6a5492 [RESTRICT AUTOMERGE] Change the intent flag to immutable 
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
Merged-In: I68132f863027fab19351b4fdbc363e5c274e3327
 2023-01-03 10:25:29 +00:00
Sorin Basca
e81d98cc08 Use Mockito 4.6.1 API 
Bug: 236636175
Test: atest SettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-12-29 00:47:06 +00:00
Arc Wang
5772502644 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours 
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history

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

Change-Id: Ie7ef5517d2e0da46d2f69a256b2758a106b74616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-19 09:09:13 +00:00