Commit Graph

682946 Commits

Author SHA1 Message Date
Anton Hansson
76b9b00a37 Merge "Baseline SAM errors" into sc-dev am: ea02255542 am: 4650ed8c8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14845416

Change-Id: Id12a74b5e3b8047edf5b2ca1b73717a097edee61
2021-06-08 09:10:50 +00:00
Anton Hansson
4650ed8c8a Merge "Baseline SAM errors" into sc-dev am: ea02255542
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14845416

Change-Id: I49ce113851951ee40a72c38b506f4aca13c1232a
2021-06-08 08:55:46 +00:00
Anton Hansson
ea02255542 Merge "Baseline SAM errors" into sc-dev 2021-06-08 08:39:58 +00:00
TreeHugger Robot
769013f594 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03 am: de4802d3b6 am: f0ace6b131
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: I54af3a02550c88794307eef945cf5629bc5488a1
2021-06-08 08:38:07 +00:00
Edgar Wang
c1cfba62bd Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec am: 25a552d4a4 am: 057c6aa9f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I838b1caef56c015aa43534a64e7e6566ba007a36
2021-06-08 08:37:50 +00:00
SongFerng Wang
39ee890e58 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours am: 43066cf2a0 -s ours am: c34bd3277e -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Ifc6f531fcdfa4693dcb85ca87f9acb6f6321a5a7
2021-06-08 08:37:21 +00:00
SongFerng Wang
6f4b498bf7 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours am: d5f51147f9 -s ours am: ddc519cb9d -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I7b19cd39f94b15130cf44c549597b1a019caf13d
2021-06-08 08:36:52 +00:00
TreeHugger Robot
83a01d4995 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03 am: 7fa83e454a am: 8212ffb227
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: I902aed4fc337d747778d36c076efdd9cc70b7bad
2021-06-08 08:36:28 +00:00
Edgar Wang
e5ad5c99b6 Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec am: e89bb85297 am: 4289483728
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I8c6ac5a0483eaad5b1dadee5197f05bedd8a0e88
2021-06-08 08:35:53 +00:00
SongFerng Wang
fe718eb278 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours am: e5344bc056 -s ours am: ca0c58cb55 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I3e99df15cf25d8dbc4935de01b1141c0f22c2917
2021-06-08 08:35:22 +00:00
SongFerng Wang
7272e110ed [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours am: 1a520e253b -s ours am: 633e440361 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Ib157095adda95383e5e8a8ebea5aa3ffd474979a
2021-06-08 08:34:50 +00:00
TreeHugger Robot
f0ace6b131 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03 am: de4802d3b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: Ie7d2eb7f04c9b6d542c469509feb715d4dc6071e
2021-06-08 08:23:09 +00:00
Edgar Wang
057c6aa9f3 Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec am: 25a552d4a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: Icc297ca9649ec26575d5de2e8ccddc3a20b77df6
2021-06-08 08:22:53 +00:00
SongFerng Wang
c34bd3277e [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours am: 43066cf2a0 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: If9d332658d86ebfcd687e618b0aef56e74a91843
2021-06-08 08:22:26 +00:00
TreeHugger Robot
3c4ab621b8 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03 am: 9652fe2712
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: I1a2cd4b229c39fcaaf3873b49f0587c48f7b1a3a
2021-06-08 08:22:26 +00:00
Edgar Wang
a1e53c073d Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec am: 70520cf120
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I44c8776d769d56284966d7041805357d6ff8966e
2021-06-08 08:22:13 +00:00
SongFerng Wang
ddc519cb9d [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours am: d5f51147f9 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I0c910596094de261e4733a7f5e23db5cfb280784
2021-06-08 08:22:03 +00:00
SongFerng Wang
832806248e [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours am: 6dadade36d -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I7f16c6f46cdda87834fb32c29efe9aa41b1c46db
2021-06-08 08:21:52 +00:00
SongFerng Wang
4b8cfbfe71 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours am: 7c74d83b59 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I394ce13557378c4bb7fbfb3728a4d2ce651ae802
2021-06-08 08:20:59 +00:00
TreeHugger Robot
8212ffb227 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03 am: 7fa83e454a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: I78bd6df3ed48cfb686fc73e3489d2664409d3c69
2021-06-08 08:15:47 +00:00
Edgar Wang
4289483728 Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec am: e89bb85297
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I0ca31916f35e285dca9a1323e1ae07b99624cafc
2021-06-08 08:15:29 +00:00
SongFerng Wang
ca0c58cb55 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours am: e5344bc056 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Iface0e213eda67782b652518f948e501a3001f04
2021-06-08 08:15:05 +00:00
SongFerng Wang
633e440361 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours am: 1a520e253b -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I03a35f75c009d1405048227878f381b57b172fb9
2021-06-08 08:14:35 +00:00
TreeHugger Robot
de4802d3b6 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: If3f7f94ee01c4d3d9d6e5f1e1354f4f5880f757d
2021-06-08 07:40:44 +00:00
Edgar Wang
25a552d4a4 Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I696abbdd7aa91f97180a294f3bd5b4826a384782
2021-06-08 07:40:13 +00:00
SongFerng Wang
43066cf2a0 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I63d7b85bfb0db363d006910f52c0422f1423eeb4
2021-06-08 07:39:54 +00:00
SongFerng Wang
d5f51147f9 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I3266837003be796152e3f36dcad1c38b9543f6fc
2021-06-08 07:39:34 +00:00
TreeHugger Robot
9652fe2712 Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: I0d3891019d7ccdb358b73a7555088d0d0d8a0e1c
2021-06-08 07:38:59 +00:00
Edgar Wang
70520cf120 Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I06bd97f75da6e8da71c68dbfddec9f8d2a35327a
2021-06-08 07:38:40 +00:00
SongFerng Wang
6dadade36d [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Ibf09cf6b744b77609331f6dadcc815c349d3b44a
2021-06-08 07:38:26 +00:00
SongFerng Wang
7c74d83b59 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Iab84715181417ffc1a82cd412db67a04eeaa3b15
2021-06-08 07:38:01 +00:00
TreeHugger Robot
7fa83e454a Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884316

Change-Id: Ie3c7696554864f9dd59136f9bf83eb8007652826
2021-06-08 07:37:15 +00:00
Edgar Wang
e89bb85297 Merge "Create SettingsLibSeekBarPreference" into sc-dev am: 57822e02ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13422685

Change-Id: I182d3cdc5ff56aacfbe1bcc74fb6898db8bae3cf
2021-06-08 07:36:34 +00:00
SongFerng Wang
e5344bc056 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours am: 3ab431f7e8 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Ia09a91643221dcecfd5c47c064986ae01f38a022
2021-06-08 07:36:10 +00:00
SongFerng Wang
1a520e253b [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours am: da280834cc -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I77830ac7e9c38f1cc449ddf7107829443c071d21
2021-06-08 07:35:49 +00:00
TreeHugger Robot
4489ee8b03 Merge "Controls - UX spacing tweaks" into sc-dev 2021-06-08 07:33:06 +00:00
TreeHugger Robot
47fb8d4533 Merge "Hide "unlock" button when the UDFPS is enabled." into sc-dev am: 68cced0eba am: d6a02b6e09 am: 2610a60104
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14878790

Change-Id: I4f22aa64fa6a15b39856bec55fccdf587e93e29c
2021-06-08 07:23:54 +00:00
Edgar Wang
57822e02ec Merge "Create SettingsLibSeekBarPreference" into sc-dev 2021-06-08 07:23:54 +00:00
SongFerng Wang
d50b759cc5 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev am: 20abbc5875 am: 255373ba35 -s ours am: c5263b1d2a -s ours am: f757a90833 -s ours am: 9f9fc35a9d -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440225

Change-Id: I7dd21d60a3e2613f609668f56a1b394292521cbc
2021-06-08 07:23:36 +00:00
TreeHugger Robot
18673147b4 Merge "Instrument latency of face unlock" into sc-dev am: d4f879b389 am: f1b0ce487a am: 3f4c8e83e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486202

Change-Id: Ic3bcea2e3e301d985607ff890eeec88e13a5a22a
2021-06-08 07:23:08 +00:00
SongFerng Wang
93ff81e689 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev am: 20abbc5875 -s ours am: 270a96b0f2 -s ours am: 44c46e8caf -s ours am: 87a4e5a507 -s ours am: d8269a85d3 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440225

Change-Id: I833ba401fe68b584bd016af4a6e259ece1881fe0
2021-06-08 07:22:55 +00:00
SongFerng Wang
959fda9e35 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-qpr-dev am: 1f1b574755 -s ours am: a8b4c93fe8 -s ours am: f430856333 -s ours am: 0309d7172e -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440226

Change-Id: Ia82347eaf05b149295b9af21decdfff787c96fe1
2021-06-08 07:22:23 +00:00
TreeHugger Robot
7f4abe4f9f Merge "Hide "unlock" button when the UDFPS is enabled." into sc-dev am: 68cced0eba am: 9384f93d97 am: b3aa548612
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14878790

Change-Id: I0d24a1bcd5f845760e50ac96d86ab7d7c0dac914
2021-06-08 07:21:53 +00:00
SongFerng Wang
0872555f7d [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev am: 20abbc5875 am: 255373ba35 -s ours am: c5263b1d2a -s ours am: 2e0ce89c86 -s ours am: 8aa76cac2e -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440225

Change-Id: Ie85a42e9a0b73695bc39ce50831b1f88f497bd63
2021-06-08 07:21:16 +00:00
TreeHugger Robot
4df12c9400 Merge "Instrument latency of face unlock" into sc-dev am: d4f879b389 am: 75f8804634 am: d8ded2ce52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486202

Change-Id: I013f48178c2cbbe739ce4e175b26eea4c69f224b
2021-06-08 07:20:35 +00:00
SongFerng Wang
f1e5c4353e [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev am: 20abbc5875 -s ours am: 270a96b0f2 -s ours am: 44c46e8caf -s ours am: 845349e36e -s ours am: 2d2f70d3a0 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440225

Change-Id: I964ac5a11c2add1c9022faea70a49d76785c9b01
2021-06-08 07:20:01 +00:00
SongFerng Wang
61aa602605 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-qpr-dev am: 1f1b574755 -s ours am: a8b4c93fe8 -s ours am: c02f007bbf -s ours am: 5463c54a06 -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440226

Change-Id: Ie56d15b33aed495513864adfab505d6f50e8d29e
2021-06-08 07:19:23 +00:00
SongFerng Wang
3ab431f7e8 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: e52fd7f78f -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I3f29e1acc2d79371bae464b2cb0069712bc91770
2021-06-08 07:18:51 +00:00
SongFerng Wang
da280834cc [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours am: f7f27429dd -s ours
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: I4c9262b2b314e772fcaac287555dbc3b9cadd47c
2021-06-08 07:18:10 +00:00
TreeHugger Robot
4a38aa7d29 Merge "Hide "unlock" button when the UDFPS is enabled." into sc-dev am: 68cced0eba am: 51dac403de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14878790

Change-Id: Ia83c29551d62b28fe47053de81d322d5b54524cf
2021-06-08 07:07:41 +00:00