PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,952 Commits 1 Branch 0 Tags
2c772d1270fe935fb373d5b5b25bd34edce62dd1
Commit Graph

125952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guojing Yuan
2c772d1270 [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: bde1a78038 -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: Iadc56ccf4464fdb63c2ef567bbf74c0c45e6a6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 13:42:14 -07:00
Guojing Yuan
0be2e7fe2f Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 7d438b77b4 am: 900dbd8df9 am: 31e737038e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: Ie3e2d20adf07f30e685065a70b1f8e6dece7cf5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 13:42:00 -07:00
Guojing Yuan
bde1a78038 [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: Icbc92e1f3ef7b596ace9e9afb038e9fdd0ff2296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 13:01:47 -07:00
Guojing Yuan
31e737038e 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: Ibfcbd49f450786c87ee3c3da86dd6e19172a36e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-12 13:01:30 -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
cf95fa5a71 [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: 1369a4c0a2 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie69507f3d3292cbd307d446866857bf625a83d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 23:21:21 -08:00
Shraddha Basantwani
e1cb84a1dd [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: 8846c65514 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ibbc9852c0e0fc9fdab833aea73dc2019ff2e51ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 23:21:18 -08:00
Shraddha Basantwani
1369a4c0a2 [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: I34de0b8621f7da6b1950457e2b039b3ab5ac495b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 22:55:56 -08:00
Shraddha Basantwani
8846c65514 [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: I4ca3ccab6bf8db56b5ed8178585c85d61c0122f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-20 22:55:52 -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
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
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
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