PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,265 Commits 1 Branch 0 Tags
042f3aebfb92a45a2aaa924b02c781642d64b4cc
Commit Graph

119265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny Shao
042f3aebfb Remove additional and unused action 
Fixes: 265276395
Test: compilation
Change-Id: Ib8e5e22ebb9f4742a60fcc28643dc5640b4db1e2
 2023-01-13 13:43:42 +08:00
TreeHugger Robot
8fce459806 Merge "Fix settings crash" 2023-01-13 02:51:11 +00:00
Jing Ji
c29bd1cdc1 Merge "Add a feature flag for the special access to the long background task" 2023-01-13 01:10:15 +00:00
TreeHugger Robot
66394f56e2 Merge "Fix checkcolor_hook error" 2023-01-13 01:02:41 +00:00
Diya Bera
38ad4e2a07 Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae am: fd252fff94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301

Change-Id: I5281b559589fcd6fdeaea49a256af4b6eea8936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 21:15:29 +00:00
Diya Bera
fd252fff94 Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev am: 6c703e12ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919301

Change-Id: I9edcd73ab9f7ab08d1f4305ecda92090171b140a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 20:03:22 +00:00
Mady Mellor
1ddb83a8cb Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032 am: 599d990913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: I2065ec218f8fa9d4c83abad8a18f1d011e24d61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 19:58:19 +00:00
Diya Bera
6c703e12ae Merge "Change in Fingerprint Error Dialog in Enrollment" into tm-qpr-dev 2023-01-12 19:30:05 +00:00
Mady Mellor
599d990913 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev am: 912ace3032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20598039

Change-Id: Ie1a6ecdc7b6a896c5839bda765a3e2ad359dd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 18:49:52 +00:00
Mady Mellor
912ace3032 Merge "Add a tablet specific illustration for bubble settings screen" into tm-qpr-dev 2023-01-12 18:16:04 +00:00
Becca Hughes
e1608b369f Fix settings crash 
Fix settings crash when dialog is shown
becuase the wrong fragment manager is
used.

Bug: 264939770
Test: unit test and test on device
Change-Id: I5f4c04740058baaa1c96a7108dc4b08b3e467fb8
 2023-01-12 18:10:24 +00:00
Kevin Liu
b37f8bf1b1 [automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: 521278a00d am: 2d0ad56211 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history

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

Change-Id: Ifa0094671af47968f9ba98c78812b9be423cf0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:20:47 +00:00
Automerger Merge Worker
0913e13c00 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9dc317eea -s ours" 2023-01-12 17:18:41 +00:00
Behnam Heydarshahi
74f725254e Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 am: 93ae531273 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Ifc2e24c703199737d647f55f8615d83795630477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:18:05 +00:00
Behnam Heydarshahi
f1ad9691f2 Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev am: 9d63dc8b6e am: 811fb9fa8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806122

Change-Id: I9bcb0251705d7a6e39dca684d80842be67cf26da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:17:05 +00:00
Bill Yi
3faa87b55f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9dc317eea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6065a3f5ce80c50659af7076c59cd8f343ca40b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:17:01 +00:00
Betty Chang
c71aaba7a2 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: feb6121894 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6420114f63d291c9377e7a8d760364b69a468f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:05:04 +00:00
changbetty
38b8de011e [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: d3e33ced2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6cedfda15b48ea845583d684e107ebac6dab4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:05:01 +00:00
Yanting Yang
d224e3a434 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours am: d5ae56c0ae -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: Icc0e3c6e120bf81b46973a84361f5a6e78d4f537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:04:50 +00:00
Yanting Yang
3df3b2ec68 [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: 9038a26635 -s ours am: 36a4373792 -s ours am: 87d4b0e0d2 -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: I85561a71a61a95d617eb1decb0d11c5cd72b0b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:04:38 +00:00
Yanting Yang
f7dd4e90f0 [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: 46c8caa6cc -s ours am: 41310e1170 -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: I8db63b91eb5a7b86cfa8045f7433da69dd6e1a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:04:28 +00:00
Yanting Yang
1945ef6790 [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: 2672815f16 -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: I73b662dfe897d28d7a497df537f857697a6ca1ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:04:19 +00:00
Yanting Yang
3f4bf61e7a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: b656b12a39 -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: I4edb8ad29c3974e0b95e7e6cb010d30254a3c217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:04:08 +00:00
Yanting Yang
debd61b979 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: c6fbd37612 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 86914bedc8 is already in history

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

Change-Id: Icdd88a832fa8248bc2526d78c04cabd65dfb057b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:03:15 +00:00
Bill Yi
3e09bc2e2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: fc6fc6cc49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c0d2b747129f21791a3a2efcef8026ace5c0bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:01:19 +00:00
Bill Yi
19aa6663c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86ae4bb50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0dd328e155464cb2973ac6742f408f0615f9e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:01:13 +00:00
Bill Yi
7758f92b72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 054685b7d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief584179d79b50c7846870ec8b8073e597230a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 17:00:36 +00:00
Tsung-Mao Fang
4a20e4f63c [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: be9c190f97 -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: If05529aba8ac4c6d8ed73c5d46eca462fbd9497a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:45:04 +00:00
Tsung-Mao Fang
67782a0d51 [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: 29d285e4e1 -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: I77eb8d138d0a77ddc8d8b71a3168c62f563bc030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:44:52 +00:00
Arc Wang
4125cd2322 [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: 55b67a4bf8 -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: Ib9617c4532632f3cdbadfccca1cb633ab42bbcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:44:40 +00:00
Tsung-Mao Fang
6803b06c44 [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: 4e8fb935d3 -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: I903dde7664aa72f2ccd332fb99767d4164bf21c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:44:37 +00:00
Tsung-Mao Fang
9d72597c12 [automerger skipped] FRP bypass defense in the settings app am: 22869d9019 -s ours am: 9764e1f9fd -s ours am: 0f05806ab5 -s ours am: 29b9f7857c -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: I6b61dc2a368e0953ed95391d286126e08c13c152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:44:27 +00:00
Arc Wang
beae88daf2 [automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours am: 0f074fcd04 -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: I3b36be7f065c435513ec260f0c435901e2df02e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:44:16 +00:00
Tsung-Mao Fang
5fb75fc237 [automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours am: d48037d603 -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: I62ea7469e484517dd4910a3bb3d936be1f56a9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:44:13 +00:00
Yasin Kilicdere
5bc838fa87 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: b408ef540d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I648970850f5cf377c743b040f5c42275dcb58659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:43:47 +00:00
Behnam Heydarshahi
93ae531273 Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100

Change-Id: Id45cee329be0245b513ad3ddd4a405fef2efb223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:37:26 +00:00
Behnam Heydarshahi
811fb9fa8d Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev am: 9d63dc8b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806122

Change-Id: Ib2c89b96573a37e3856da1d8db240ec151eeb422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:37:14 +00:00
TreeHugger Robot
5f8d5f2406 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 05e75b5f23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fffcd6eff39ecafd6277c0d798eac196bc4fa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:23:53 +00:00
Bill Yi
8effce9d06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3804e1e0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia465bce7a08197e9c3db76f2022ee30404d25758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:23:20 +00:00
Behnam Heydarshahi
cf022d4537 Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev 2023-01-12 16:15:27 +00:00
Behnam Heydarshahi
9d63dc8b6e Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev 2023-01-12 16:14:15 +00:00
TreeHugger Robot
066a102995 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d161ba7652 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c84cf9aee552193c41fea708ac6ebe43aca37e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 15:58:50 +00:00
Bill Yi
e3e4de9e83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f5f00347a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61bddef910d08f34da363d9aa3e64fb11a7da42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 15:58:41 +00:00
Bill Yi
6ae98c88cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb0de39122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I590e56b6516e8789310a68289f52d7ff5bebd121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 15:58:21 +00:00
Josep del Río
8d1cb3c97a [automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 98bfab5f23 -s ours am: 5bff56abab -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

Change-Id: I472a7385324fbce5692caaa31891047ffa87e349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:53:52 +00:00
Sorin Basca
465086f7e8 [automerger skipped] NEW Use Mockito 4.6.1 API am: a962b4b712 -s ours am: 721798dc8c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

Change-Id: I5ba2a5b613861a60ac3cab86f231c99cfe1eb97f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:53:43 +00:00
Josep del Río
5bff56abab [automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 98bfab5f23 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I8eb25f71cf788e590d6033e156cd0c4b67e548c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:50:31 +00:00
Sorin Basca
721798dc8c [automerger skipped] NEW Use Mockito 4.6.1 API am: a962b4b712 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ie2483910aa01e825f3257f0d07c3fc399d434835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:49:47 +00:00
Josep del Río
98bfab5f23 Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev 2023-01-12 14:17:44 +00:00
Sunny Shao
97cc69b7aa Fix checkcolor_hook error 
Bug: 265259233
Test: repo upload OK
Change-Id: Iff552bf0927136e747de502d8aae298c114c251e
 2023-01-12 22:00:44 +08:00