Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,561 Commits 3 Branches 0 Tags
bf51ebd533d2ecedd35001fdd0bbbe270df998e2
Commit Graph

761561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
bf51ebd533 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 am: ff8964d756 am: cdcc7859fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Ib941c1aa4aa6a17587dfecb1635a0d258b6cdd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 22:12:51 +00:00
Makoto Onuki
cdcc7859fd Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 am: ff8964d756 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I33024e49ddc185adc8aee70709b221e7e3d7c48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 21:48:50 +00:00
Makoto Onuki
ff8964d756 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Iaaf2fd27d215c4806d08bcdb12a03b459dcc7d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 21:23:22 +00:00
Justin Weir
2540293518 Merge "Add settings observing for vibrate icon to Keyguard" into tm-dev 2022-06-08 21:00:18 +00:00
Andrey Epin
52a3a57b55 Merge "Limit preview width to the max chooser width value." into tm-dev 2022-06-08 20:59:18 +00:00
Yasin Kilicdere
f171d00972 Merge "Wait for ACTION_MEDIA_MOUNTED before removing started users." into tm-dev 2022-06-08 20:58:41 +00:00
Makoto Onuki
6a68d207f0 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I1e1671c18a1573e819b76cbfb739d42cadc43aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 20:38:29 +00:00
Ilya Matyukhin
ec8a221a4f Merge "Revert "Dismiss Auth Biometric Prompt when expanding shade"" into tm-dev 2022-06-08 20:15:00 +00:00
Makoto Onuki
f15b3c2553 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I467f9641cf1376babab8328a06ec173a1c768fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 20:13:20 +00:00
Makoto Onuki
ea69ad5892 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I19750ed605001905eee78852893d1b18e8f274bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:55:08 +00:00
Evan Laird
0a4a157598 Add settings observing for vibrate icon to Keyguard 
KeyguardStatusBarViewController now listens to the "show vibrate icon in
status bar" setting and observes changes to the setting.

Added a utility function in StatusBarIconBlocklist to keep the logic in
sync, with a place for expansion in the future.

Test: atest KeyguardStatusbarViewControllerTest; manual
Fixes: 200246761
Change-Id: Idd2c7f6c706ad40946f0d067a442ea87636ec68c
 2022-06-08 15:41:50 -04:00
Makoto Onuki
822fbf618b Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Ie919bc05747a1009507a29de429c3e8d043fed9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:20:45 +00:00
Makoto Onuki
99ccb4e5b0 Merge "Only allow the system server to connect to sync adapters" into qt-dev 2022-06-08 18:56:23 +00:00
Songchun Fan
d70fd7a211 Merge "[pm] fix missing PACKAGE_CHANGED broadcasts" into tm-dev 2022-06-08 16:46:38 +00:00
Winson Chung
a5bd90617e Merge "Notify of new top task changes when a top task is moved to the back" into tm-dev 2022-06-08 16:03:49 +00:00
Winson Chung
974769ca52 Notify of new top task changes when a top task is moved to the back 
- Launcher currently relies on the current top task to cache the task
  for the next swipe gesture (skipping a synchronous binder call to
  fetch the top task, which can cause ANRs)

Bug: 232423798
Test: Open task B from task A, go back, and ensure Launcher gets
      notified that A is moved to top
Change-Id: Ia1ff90c776437c7443a472cea587b6bf78e332f0
 2022-06-08 16:03:17 +00:00
Shan Huang
a671783048 Merge "Fix NPE from BackAnimationController#setBackToLauncherCallback." into tm-dev 2022-06-08 16:00:26 +00:00
TreeHugger Robot
94c91a89cf Merge "Post updateClockViews when called within onLayout" into tm-dev 2022-06-08 15:28:24 +00:00
Ilya Matyukhin
8a2faaff8c Revert "Dismiss Auth Biometric Prompt when expanding shade" 
This reverts commit d2815c0b42.

Reason for revert: b/233820283

Change-Id: Ib3c9b79b4d76890d476b8f7ddb19b025f6042473
 2022-06-08 15:11:19 +00:00
Jeff DeCew
2f541168e3 Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev 2022-06-08 13:58:02 +00:00
Adrian Roos
5a416bea9c [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I0593f7038a72d8862f075ae442eb519a1352bd19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 09:32:27 +00:00
Adrian Roos
3bf325c723 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: If18c7d6840c651f8855de10e36365f891c5efb3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 09:15:44 +00:00
Adrian Roos
1f8941c367 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I0d96cacebc12d1b01a837384e6d97efacb041be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 09:06:32 +00:00
Adrian Roos
dbfa39a262 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I7b916c35a774e0c0ffa72658ce9891d5b032d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:57:59 +00:00
Adrian Roos
06f9b5d3b5 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I585332631560e95222fca628a05a3e88fa45e374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:32:29 +00:00
Adrian Roos
c8ba614846 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: Ib015905b7424382f6967432846fa74843215ba08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:31:21 +00:00
Adrian Roos
617aa519be [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I507eca53851fd555c2c255ce3793dd08fc788850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:16:24 +00:00
Adrian Roos
ba943db1e3 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I4fa5e5be588638b589c8b9c22a3d00513a824fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:14:36 +00:00
Adrian Roos
b55f60342e [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: Ifd144385a66308821717d6ed9ecd548d400266fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:57:26 +00:00
Adrian Roos
7a57d77f94 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I893c9a98526745498718ea447044a10e4fcf4475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:57:05 +00:00
Adrian Roos
b930850863 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours am: c166e048b1 -s ours am: df29fca37f -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: Ica91e5a020ca670a2918f07e5ebc91c745db7123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:48:14 +00:00
Adrian Roos
415faf8952 [automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours am: 9037f3e92f -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history

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

Change-Id: I4f3fcac287b74c810ab3b8df615a0b9f31375938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:47:38 +00:00
Adrian Roos
58ae8102ff [automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours am: 3abb4f5610 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history

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

Change-Id: Ic2f24164dc19e690ecda7011411c1b06eb3ccaac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:47:12 +00:00
Adrian Roos
df29fca37f [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours am: c166e048b1 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I022a431fc6932160a84cb616df070bd165faaf79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:41:36 +00:00
Adrian Roos
9037f3e92f [automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history

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

Change-Id: I9bd7992cf03c8534b0a5cd788191e883e775693d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:41:24 +00:00
Adrian Roos
3abb4f5610 [automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history

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

Change-Id: Ie2f49c8df318117474d03e0c42b23c4db262384d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:41:22 +00:00
Adrian Roos
c166e048b1 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: Ifd16c92c627c0b070a898deef255a9d010ff6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:40:24 +00:00
Adrian Roos
c2d5e2cb81 Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968

Change-Id: Ia6115784eb97b7759750acca4f271772f8a59ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:40:15 +00:00
Adrian Roos
b1bf36ab7e [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-v2-dev am: 1fce20e86e -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 9df1f523f1 is already in history

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

Change-Id: Icd13af4098897cac7ee7ae02729787ef27aeb80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:39:53 +00:00
Adrian Roos
ba07903512 [automerger skipped] Restrict getInputMethodWindowVisibleHeight am: 2ab01736a6 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 9df1f523f1 is already in history

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

Change-Id: I5f75c102dc7fd4a6d4f098a5a812dceed34cbb77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:39:33 +00:00
Adrian Roos
a89cdcefab Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305

Change-Id: I24bd536937c9794cc17ec42eeeb047940adbb884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:39:21 +00:00
Adrian Roos
fa1fc20874 Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev 2022-06-08 07:21:26 +00:00
Adrian Roos
31e8959439 Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev 2022-06-08 07:20:12 +00:00
Adrian Roos
4bc778ea49 Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev 2022-06-08 07:19:51 +00:00
Adrian Roos
25967449d4 Merge changes from topic "b204906124-sc" into sc-qpr1-dev 
* changes:
  [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390
  Restrict getInputMethodWindowVisibleHeight
 2022-06-08 07:19:51 +00:00
Adrian Roos
1fce20e86e Merge "Restrict getInputMethodWindowVisibleHeight" into sc-v2-dev 2022-06-08 07:18:35 +00:00
Chiachang Wang
1f684ba68c [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours am: 73278838f4 -s ours am: 25ceaff1d5 -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: Ie07432d55be9f640245609d4a9fb68cb1bb591a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 05:19:30 +00:00
Chiachang Wang
25ceaff1d5 [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours am: 73278838f4 -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: Iadad70d6326488043ce200842f1e75211ca8d64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 04:38:45 +00:00
Chiachang Wang
73278838f4 [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: I806e6e4942667cb2923eb452a1081d28eb2b5f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 04:13:49 +00:00
Chiachang Wang
13d9983159 [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: I1467c8313b9ec436a0c25394dd6a526fcbf1c1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 03:44:57 +00:00