Commit Graph

125931 Commits

Author SHA1 Message Date
Shraddha Basantwani
9c4fe2cba8 [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: ff5d2909c3 -s ours am: 6971b81737 -s ours am: f624140994 -s ours
am skip reason: contains skip directive

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

Change-Id: I242a0dc8482fbe8ccf217c6d3e3f2d605ad85bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 23:02:06 -08:00
Shraddha Basantwani
87c27625d8 [automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 am: 6d0d1c4fcb -s ours am: c0e03c7114 -s ours am: cc7351c800 -s ours
am skip reason: contains skip directive

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

Change-Id: Iee8701d6aca6ae81cfef5a81ab7eb58317541fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 23:02:03 -08:00
Shraddha Basantwani
f624140994 [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: ff5d2909c3 -s ours am: 6971b81737 -s ours
am skip reason: contains skip directive

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

Change-Id: Id45489cacf21c6baa0319fac8562ac3ff9a3c975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 22:35:22 -08:00
Shraddha Basantwani
cc7351c800 [automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 am: 6d0d1c4fcb -s ours am: c0e03c7114 -s ours
am skip reason: contains skip directive

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

Change-Id: I34ed526fe27a249341db4772525c36568580e579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 22:35:17 -08:00
Shraddha Basantwani
6971b81737 [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: ff5d2909c3 -s ours
am skip reason: contains skip directive

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

Change-Id: Id2902e7e2b7f24d38f5a331347b67f6709b71d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 22:13:25 -08:00
Shraddha Basantwani
c0e03c7114 [automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 am: 6d0d1c4fcb -s ours
am skip reason: contains skip directive

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

Change-Id: I7bed3ce3b79d4ad77317de941732f44503e1531c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 22:13:16 -08:00
Shraddha Basantwani
ff5d2909c3 Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223

Change-Id: Iae8a311c061232a41614d3836cf89022c19c62db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 21:37:24 -08:00
Shraddha Basantwani
6d0d1c4fcb RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223

Change-Id: If2b7208f85717859c7b38f826f674021cb098c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-13 21:37:16 -08:00
Shraddha Basantwani
f313de51cf Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev 2025-02-13 21:13:39 -08:00
Shraddha Basantwani
6179d4fdf3 RESTRICT AUTOMERGE Add biometric authentication for package modification
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages

Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb)
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
2025-02-12 01:36:35 -08:00
Shraddha Basantwani
f62bf8007c [automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b -s ours am: 1182123e70 -s ours am: 31ec831661 -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92 is already in history

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

Change-Id: I7e65c0d37e59318e7b0f4ecb7ecd024afcc86e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:57:06 -08:00
Shraddha Basantwani
14efecb346 [automerger skipped] Add biometric authentication for package modification am: 0634208161 -s ours am: fb65cbfd6e -s ours am: 9a444e43f7 -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92 is already in history

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

Change-Id: I38d5c28472362c35768e2b62eff8f0a20a3fe07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:57:01 -08:00
Shraddha Basantwani
31ec831661 [automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b -s ours am: 1182123e70 -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92 is already in history

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

Change-Id: I75f90e49d739e7ace94404ee7f68e9bb278b1d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:31:13 -08:00
Shraddha Basantwani
9a444e43f7 [automerger skipped] Add biometric authentication for package modification am: 0634208161 -s ours am: fb65cbfd6e -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92 is already in history

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

Change-Id: I691bc0d2658c29ca6c81cb886f9ca428cb49fcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:31:09 -08:00
Shraddha Basantwani
066570ac4f [automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df -s ours am: dc3b960f44 -s ours
am skip reason: skipped by basantwani

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

Change-Id: I6bf17f72bd4d18e40d3133c45b9207befa976f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:09:06 -08:00
Shraddha Basantwani
1182123e70 [automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92 is already in history

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

Change-Id: I644e45678227eeb8868f448c6781a6b814e7bda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:08:51 -08:00
Shraddha Basantwani
fb65cbfd6e [automerger skipped] Add biometric authentication for package modification am: 0634208161 -s ours
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92 is already in history

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

Change-Id: I4a7745efe000de2fb5c3df3323b88df78804333e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 22:08:44 -08:00
Shraddha Basantwani
f459d4073b Merge "Add biometric authentication for package modification" into tm-qpr-dev 2025-02-09 21:48:53 -08:00
Shraddha Basantwani
dc3b960f44 [automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df -s ours
am skip reason: skipped by basantwani

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

Change-Id: Iac0fba3656ccfc87eddef86bfcaaf838102c1fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-09 21:43:57 -08:00
Shraddha Basantwani
0634208161 Add biometric authentication for package modification
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages

Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb)
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
2025-02-09 20:25:50 -08:00
Shraddha Basantwani
1c5b48c8df Merge "[SPA] Add biometric authentication for package modification" into udc-dev 2025-02-05 01:49:56 -08:00
Shraddha Basantwani
27315b3b92 [SPA] Add biometric authentication for package modification
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages

Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest PackageInfoPresenterTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb)
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
2025-02-05 00:12:40 -08:00
Treehugger Robot
06151a58c6 Merge "[SPA] Add biometric authentication for package modification" into udc-qpr-dev 2025-02-04 20:46:20 -08:00
Matías Hernández
adf9bed8e8 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 am: 6e347e2da2 -s ours am: 64b322af00 -s ours am: 088e57a6ae -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 2a6672dd33 is already in history

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

Change-Id: Id4169c53e7ed6d66c32ea6700d17c89e99210df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 05:10:32 -08:00
Matías Hernández
d85a1ca8a8 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: c2c7c0d984 -s ours am: 8a9a9fd424 -s ours am: 01fbb2e467 -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805 is already in history

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

Change-Id: I9c40e01170b38f8529e1d026841f4e5f85663007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 05:10:21 -08:00
Matías Hernández
088e57a6ae [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 am: 6e347e2da2 -s ours am: 64b322af00 -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 2a6672dd33 is already in history

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

Change-Id: I512edb860208ecaa5bcd6286bbe8bcc2c590e091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 04:55:27 -08:00
Matías Hernández
64b322af00 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214 am: 6e347e2da2 -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 2a6672dd33 is already in history

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

Change-Id: I2a6cdfeda9d4e5ee1cbeae153d045307f9f431d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 04:44:54 -08:00
Matías Hernández
01fbb2e467 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: c2c7c0d984 -s ours am: 8a9a9fd424 -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805 is already in history

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

Change-Id: I0c99a21951a03734c9ac1c92b973b739c9830edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 04:44:25 -08:00
Matías Hernández
8a9a9fd424 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: c2c7c0d984 -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805 is already in history

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

Change-Id: I5ab047ebeafc9ac13f7f674ca9047189dd9ffb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 04:12:02 -08:00
Matías Hernández
6e347e2da2 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356 am: dbf59af214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: I41492e7b420b14aac7dd658cc604d337a3abb137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 04:10:32 -08:00
Matías Hernández
f1f74e26c2 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4 am: 04cbe370a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31172435

Change-Id: I5ec88479adeaf240e7df61673b73ba54c5b3d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:48:07 -08:00
Matías Hernández
dbf59af214 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: Ic9cbc10ea435cff9c5eb7b35b38257c868ce0b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:36:07 -08:00
Matías Hernández
c2c7c0d984 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: I7234cc71c93f69f44b8d05bee2169cf297064ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:35:54 -08:00
Matías Hernández
04cbe370a1 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31172435

Change-Id: I0f51099793d0e2bece4989e59583533191f6a561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:23:22 -08:00
Matías Hernández
98fc4f2356 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev 2025-02-03 03:10:38 -08:00
Matías Hernández
4a584df0c4 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev 2025-02-03 02:57:39 -08:00
Treehugger Robot
638c49a6b2 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours am: 055febeeb4 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: I1768ef92573048039bd41e33d025e8656f680aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:05 -08:00
Treehugger Robot
055febeeb4 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: Ie55525fb0bf7c3ae6fb7c1f4a24cf29edefaf190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:15:36 -08:00
Treehugger Robot
ce8bc299bf [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours am: 1451c50e5a -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I448da232ef6f34776c5a6004b056b4ecb28878a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:43 -08:00
Treehugger Robot
8852d1464c [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours am: 3cd2d3b8fe -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: If70682d5bf713b0792d63f339be6015c27070fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:34 -08:00
Fan Wu
a0a32c32dd [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours am: 44ed327b4c -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I6a09f83e08b791ca0ab3a012de25c1b4a78d9216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:30 -08:00
Treehugger Robot
4df8ee0043 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 am: c9a7157c71 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 201d7ffac4 is already in history

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

Change-Id: I33192a50d4d49ed38bf3693af58514cb72c98795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:21 -08:00
Treehugger Robot
c6f3f33258 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: I85e500ef02493fd5a37336b8b983312979e4e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:06:05 -08:00
Treehugger Robot
1451c50e5a [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: Ib018070849f9cfdd309ccad457d300f635601e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:04:22 -08:00
Treehugger Robot
8984963099 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: I4821f3d369279bb44b031895e32fead87de95382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:18 -08:00
Treehugger Robot
55de28ad5f [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

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

Change-Id: I213e8ca7c014faa461b47da068ef777882aaddf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:50:46 -08:00
Treehugger Robot
3cd2d3b8fe [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: Ica7cf1e1a8660b9c295bdb051e0ebb780266c56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:48:29 -08:00
Fan Wu
44ed327b4c [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

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

Change-Id: Ia03cc7dca52005f828351b222dcb6de3b67e16f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:48:23 -08:00
Treehugger Robot
c9a7157c71 Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: I81c8a012a24619ecae995394561022a79fb28ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:48:10 -08:00
Treehugger Robot
f8c6feffe5 Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: Ibe53a373f1598632bd16c1e2659644d28bb1f11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:24:32 -08:00