PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,530 Commits 1 Branch 0 Tags
01693a99889622f0e4eabae69fc66bdf3873419c
Commit Graph

124530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guojing Yuan
01693a9988 [automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 219079c50b am: ccce5d5dd5 -s ours am: 9e7a97cf70 -s ours 
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf is already in history

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

Change-Id: If8032d2cdc61d656a86109e480e225cbbc0fd250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 13:06:34 -07:00
Guojing Yuan
d46a401c18 Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 7d438b77b4 am: 900dbd8df9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: Ie16c398ccdb50d4aadb345de6d02a86dcd2b3055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 13:06:18 -07:00
Guojing Yuan
9e7a97cf70 [automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 219079c50b am: ccce5d5dd5 -s ours 
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf is already in history

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

Change-Id: I6601c8fecf33dcd903d5533872181edb4c1fff6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 12:53:17 -07:00
Guojing Yuan
900dbd8df9 Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 7d438b77b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: I0c27308d3f8b3532e21fddfdfb48abe03d6a456b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 12:30:19 -07:00
Guojing Yuan
ccce5d5dd5 Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 219079c50b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: I1cbe0436ee22c9793566f862c1b5d2b58f03c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 12:28:47 -07:00
Guojing Yuan
219079c50b Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: I15292b0ac9a408454e079642ce652737bd490ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 11:56:32 -07:00
Guojing Yuan
7d438b77b4 Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: Ifd237482647e4893c2e4dddcb87340de5a5fe610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 11:55:45 -07:00
Guojing Yuan
14629c9d47 Merge "[CDM] Checks NLS component name instead of package name" into tm-dev 2025-03-12 11:22:03 -07:00
Shraddha Basantwani
c467e11211 [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: 1135fa48e1 -s ours am: ba7d8ce77e -s ours am: 4dd997ea37 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ia46678a6e7893cd9084c440b7927ece9e14cb1ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 22:57:26 -08:00
Shraddha Basantwani
8e1add2144 [automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 am: 89b17839a5 -s ours am: b3a57ea2c2 -s ours am: a1870f90e9 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie06bcd8e700d148962683906fde1d0282f94f4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 22:57:22 -08:00
Shraddha Basantwani
4dd997ea37 [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: 1135fa48e1 -s ours am: ba7d8ce77e -s ours 
am skip reason: contains skip directive

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

Change-Id: I62420ce97e1ec5575e9741a0d476ac6a3354e5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 22:33:02 -08:00
Shraddha Basantwani
a1870f90e9 [automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 am: 89b17839a5 -s ours am: b3a57ea2c2 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icae9b8d2558dd874aac099d371d90afa763ecf6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 22:32:55 -08:00
Shraddha Basantwani
ba7d8ce77e [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: 1135fa48e1 -s ours 
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 0634208161 is already in history

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

Change-Id: I326918d24e14962639e02937fc1087ed5801cf9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 21:47:14 -08:00
Shraddha Basantwani
b3a57ea2c2 [automerger skipped] RESTRICT AUTOMERGE Add biometric authentication for package modification am: 6179d4fdf3 am: 89b17839a5 -s ours 
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 0634208161 is already in history

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

Change-Id: Ie578507a82660b462a2141e5a3a1c38b2e0a6532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 21:47:09 -08:00
Shraddha Basantwani
bdbf97da8e [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: Ie87f77f8763017cce623b5b830f13d3b22aa114e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-13 22:36:55 -08:00
Shraddha Basantwani
87cf31fe24 [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: I9e5654003f34fa257e2eb82d52f32be4d867c4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-13 22:36:50 -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
1135fa48e1 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: I6bc25fa953a90273e9bb412458e64361e6825e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-13 21:37:32 -08:00
Shraddha Basantwani
89b17839a5 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: Ia4175025417fd2b0b4cc54a42a1d218dd46148cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-13 21:37:26 -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
Guojing Yuan
b0fce927bf [CDM] Checks NLS component name instead of package name 
Bug: 386216637
Flag: EXEMPT bugfix
Test: CTS

Change-Id: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
Merged-In: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
(cherry picked from commit f5ed187ffb)
 2025-02-13 11:54:35 -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
37ea2bcd57 [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: I8df6ff7222d1e869cd84ed220c547da97cf7cf1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-09 22:32:48 -08:00
Shraddha Basantwani
9958349551 [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: I5fc2e7a9e5e51b16248059b0e593b319df4b3606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-09 22:32:42 -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
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
760b9fb16d Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686364

Change-Id: I6b3c68bd4b23f34eb4a7cdc048faf0ad6588a62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-05 01:55:22 -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
Matías Hernández
15e42e2fa2 [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: I6d017757de8d9a4f25b5100c72518f105d045064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:46:10 -08:00
Matías Hernández
c520da8486 [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: Ia8c943358bb53d7645c9743d98916e6a7dbc9408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 04:46:00 -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
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
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
a434120410 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: Ieb627204dbc2bfb48e665c7c5850bb30b591bac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-03 03:25:07 -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
5ef3e25948 [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: I0354cdc556691a539bc530284517a660489918da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 04:19:06 -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
5ccbef81b8 [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: I2cd5429035be307341db245ad64dde312ebc693b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:52:32 -08:00
Treehugger Robot
e5a837a9d8 [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: I2970c99575de748f8ee3bc8b7f6807fd321af11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:52:23 -08:00
Fan Wu
82d37340b5 [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: I7fd0cb6aeeaceafb9736eed5c1348c27f7ebbbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-01 03:52:20 -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