Commit Graph

18984 Commits

Author SHA1 Message Date
Jeff Sharkey
ad18b6f58c Merge changes from topic "jul15" am: 0e27faa039 am: 954431c4df am: fd0915aeec am: 70123a912d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659

Change-Id: I6d5cc1577c71cf60fe16c62d5523cfb5c3a10468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:20:04 +00:00
Jeff Sharkey
954431c4df Merge changes from topic "jul15" am: 0e27faa039
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659

Change-Id: Ie949e0bb40967581190f7b98bb5005bab19cb7fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 19:12:28 +00:00
Jeff Sharkey
c6b3699b63 Offer explicit 3-byte vs 4-byte modified UTF-8.
As documented in art/runtime/jni/jni_internal.cc, ART has deviated
from the RI by using a 4-byte encoding instead of the 3-byte encoding
required by the JNI specification.

Some users are okay with this 4-byte encoding (where they control
both the reading and writing logic) but other users require
compatibility with the DataOutput/DataInput API contract, so this
change lets users request either behavior.

This change now exercises all tests in both 4-byte and 3-byte modes,
and exhaustively confirms that all valid code-points match the
DataOutput/DataInput contract when in 3-byte mode.

Benchmark results still show significant performance benefits when
using this 3-byte encoding over the upstream RI:

    timeRead_Upstream_mean (ns):                  5090068
    timeRead_LocalUsing3ByteSequences_mean (ns):  1996032
    timeRead_LocalUsing4ByteSequences_mean (ns):  1813250

    timeWrite_Upstream_mean (ns):                 3856276
    timeWrite_LocalUsing3ByteSequences_mean (ns): 1632697
    timeWrite_LocalUsing4ByteSequences_mean (ns):  886503

Bug: 236923096
Test: atest FrameworksCoreTests:CharsetUtilsTest
Test: atest FrameworksCoreTests:FastDataTest
Test: atest FrameworksCoreTests:XmlTest
Test: atest FrameworksCoreTests:BinaryXmlTest
Test: ./frameworks/base/libs/hwui/tests/scripts/prep_generic.sh little && atest CorePerfTests:FastDataPerfTest
Change-Id: Ibddd36410a0d4a909522de011f23a337b53d6889
2022-07-19 10:36:37 -06:00
Alex Buynytskyy
2be5b4c118 Cache least recently used output buffer.
- reduce memory allocations especially when Xml is serialized inside a
tight inner loop,
- performance slightly improved.

BEFORE:
100 packages:
[2/4] android.util.XmlPerfTest#timeWrite_Binary: PASSED (10.516s)
	timeWrite_Binary_mean: 674979
	threadAllocCount_mean: 59
	timeWrite_Binary_min: 671194
	timeWrite_Binary_median: 674798
	timeWrite_Binary_standardDeviation: 3658
	threadAllocSize_mean: 530176
10 packages:
[2/4] android.util.XmlPerfTest#timeWrite_Binary: PASSED (10.542s)
	timeWrite_Binary_mean: 71113
	threadAllocCount_mean: 56
	timeWrite_Binary_min: 70201
	timeWrite_Binary_median: 71237
	timeWrite_Binary_standardDeviation: 692
	threadAllocSize_mean: 59136
1 package:
[2/4] android.util.XmlPerfTest#timeWrite_Binary: PASSED (10.091s)
	timeWrite_Binary_mean: 15698
	threadAllocCount_mean: 56
	timeWrite_Binary_min: 15072
	timeWrite_Binary_median: 15677
	timeWrite_Binary_standardDeviation: 410
	threadAllocSize_mean: 6439

AFTER:
100 packages:
[1/1] android.util.XmlPerfTest#timeWrite_Binary: PASSED (10.221s)
	timeWrite_Binary_mean: 605862
	threadAllocCount_mean: 53
	timeWrite_Binary_min: 602353
	timeWrite_Binary_median: 604424
	timeWrite_Binary_standardDeviation: 4972
	threadAllocSize_mean: 492748
10 packages:
[1/1] android.util.XmlPerfTest#timeWrite_Binary: PASSED (10.575s)
	timeWrite_Binary_mean: 58710
	threadAllocCount_mean: 50
	timeWrite_Binary_min: 57551
	timeWrite_Binary_median: 57798
	timeWrite_Binary_standardDeviation: 2129
	threadAllocSize_mean: 21696
1 package:
[1/1] android.util.XmlPerfTest#timeWrite_Binary: PASSED (10.151s)
	timeWrite_Binary_mean: 11576
	threadAllocCount_mean: 50
	timeWrite_Binary_min: 11315
	timeWrite_Binary_median: 11381
	timeWrite_Binary_standardDeviation: 431
	threadAllocSize_mean: 4336

Test: atest FastDataPerfTest XmlPerfTest
Bug: 195994150
Fixes: 195994150

Merged-In: Ieedd27a676d718967c2fac30bc48a68ae636a180
Change-Id: Ieedd27a676d718967c2fac30bc48a68ae636a180
2022-07-15 16:07:19 -06:00
TreeHugger Robot
de8e7777c8 Merge "Ensure all FrameTracker invocation run on either main or ui thread" into tm-qpr-dev am: 91a0bbdddf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18654746

Change-Id: I2b159823f2952f1de43f11bdbeadfe6971767471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 20:45:08 +00:00
TreeHugger Robot
91a0bbdddf Merge "Ensure all FrameTracker invocation run on either main or ui thread" into tm-qpr-dev 2022-07-14 20:25:06 +00:00
Bill Lin
bfb19f11fc Merge "Instrument CUJ_SHADE_CLEAR_ALL with InteractionJankMonitor" into tm-qpr-dev am: fb4fdcee9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272632

Change-Id: I3f8a0c7dc1ae8239855977c73c13d9ff289c5cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 16:00:53 +00:00
Ahan Wu
f7bd2bc6ba Ensure all FrameTracker invocation run on either main or ui thread
FrameTracker has some ViewRootImpl invocations that it would be better
to make FrameTracker accesses run on either main or ui thread.

Bug: 200938639
Test: atest InteractionJankMonitorTest FrameTrackerTest
Change-Id: I91e9536293a694f3d110bda583a32b5918c96c55
2022-07-14 09:34:04 +00:00
lbill
03e80d715b Instrument CUJ_SHADE_CLEAR_ALL with InteractionJankMonitor
In NotificationStackScrollLayout
- Begin instrument in clearNotifications()
- End in onClearAllAnimationsEnd()

Note: due to all child views run clear anim concurrently,
we just monitor parent(NSSL).

Bug: 238863970
Test: atest SystemUITests
Test: make and get perfetto trace
Change-Id: I705d03357a5a458a7f9eae5ecc5c4cfd7811cf7c
2022-07-14 07:59:12 +00:00
Alex Buynytskyy
f8dcaf2fc0 Merge "Forcefully convert to basic Intent before calling PM API." into tm-qpr-dev am: aec1a526b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19221809

Change-Id: I1ea0c55c86bf8a53c4668042fa2a8e8df22441b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 16:40:36 +00:00
Alex Buynytskyy
682df5bb41 Forcefully convert to basic Intent before calling PM API.
AIDL can't accept subclasses, see more info in the bug

Bug: 238277108
Fixes: 238277108
Test: follow steps in the bug, click on share
Change-Id: Ie691df4566e6b622c868bbed4377afc1ee82807d
2022-07-09 18:29:58 +00:00
Andrey Epin
68242f1b4b Merge "Fix Chooser-to-editor transition animation" into tm-qpr-dev am: 9b723322f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18304427

Change-Id: Ic3dc5abac382389e916325dda7a59c90a2dfa9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 18:03:47 +00:00
Andrey Epin
9b723322f1 Merge "Fix Chooser-to-editor transition animation" into tm-qpr-dev 2022-07-07 17:53:29 +00:00
Andrey Epin
3d11dbc77c Merge "ResolverDrawerLayout to request layout when needed." into tm-qpr-dev am: d238f79f92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19142926

Change-Id: Ic131b206b4c4153334a876e01649833477ce8887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 17:05:27 +00:00
Andrey Epin
d238f79f92 Merge "ResolverDrawerLayout to request layout when needed." into tm-qpr-dev 2022-07-07 16:45:47 +00:00
Jerry Chang
338bfb7b48 Merge "Make sure system bars have visible background while force-showing" into tm-qpr-dev am: b11f679d66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19193687

Change-Id: Icbf6a52c98e8f0f6245594daee7f0502698d46f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 02:14:42 +00:00
Jerry Chang
b11f679d66 Merge "Make sure system bars have visible background while force-showing" into tm-qpr-dev 2022-07-07 01:59:39 +00:00
Andrey Epin
e83e0620bd Fix Chooser-to-editor transition animation
Add a scene animation - image thumbnail in Chooser to full-size image in
the editor - when the thumbnail is visible.
Finishing Chooser activity while the transition animation is running
produces an effect of "flashing" background (as the activity disappears
before the animation completed). Thus the call to finish the activity is
delayed until the activity is stopped (i.e. becomes fully invisible).

Fix: 231448720

Test: Use 'Files' app to share an image, select Edit in the Chooser,
 observe animation (optionally slow down the animation in the developer
 settings)
Test: The same as the previous test but in the split-screen mode.
Test: Slow-down animation, select "edit" in the chooser and cancel the
 animation mid-flight. The ChooserActivity pauses and resumes and
 remains overall functional (had to slow down the fade-out animation in
 the code). The animation in this case is broken but
 addressing this case is beyond the scope of this change.
Test: Use a mock app with the dialog-themed activity instead of the
system image editor; check that Chooser fades out and finishes in
background.
Test: Accessibility with talk-back on.

Change-Id: I982b9b2a8a049b5986dce521ee1abcd9ad83ba38
2022-07-06 10:05:24 -07:00
Jerry Chang
1c995fa719 Make sure system bars have visible background while force-showing
Client insets controller can request to hide system bars to enter
immersive mode. However, there're cases force-show system bars like in
split screen or freeform mode. This makes sure the background view of
system bars are always visible while force-showing.

Fix: 234196894
Test: put an immersive app in split, verified system bars background
      won't be invisible
Change-Id: Ia167bce9e64cd81a2ade499f8c6528384d957209
2022-07-06 12:22:11 +00:00
Nick Chameyev
cf7494fd79 Merge "[Partial screen sharing] App selector initial version" into tm-qpr-dev am: 0b670f205e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188206

Change-Id: I86840a3e81feffe9d6f978467f04d3d1bd6a6eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 15:20:12 +00:00
Nick Chameyev
0b670f205e Merge "[Partial screen sharing] App selector initial version" into tm-qpr-dev 2022-07-05 15:02:58 +00:00
Christian Göllner
c227aaa274 Merge "Create API for WM to send letterbox info to SysUI." into tm-qpr-dev am: fb27457c53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19032748

Change-Id: If10ac7a41f17332c3bdd5ace51aa436c7b9f8e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 07:52:39 +00:00
Christian Göllner
fb27457c53 Merge "Create API for WM to send letterbox info to SysUI." into tm-qpr-dev 2022-07-05 07:30:40 +00:00
Nick Chameyev
2bcb37a7ab [Partial screen sharing] App selector initial version
Adds an activity that inherits ChooserActivity
to select an app in the partial screen sharing
flow under a feature flag.
It doesn't have a proper visual design, analytics,
enterprise policies handling.

Bug: 218314434
Test: start partial screen sharing
Change-Id: Ia7d9ae07e2ef35d33f85530f26cab4e6cdc1f94a
2022-07-04 16:14:09 +00:00
Christian Göllner
a42e8efc83 Create API for WM to send letterbox info to SysUI.
+ Creates a new LetterboxDetails parcelable class
+ Adds LetterboxDetails as a parameter to IStatusBar#onSystemBarAttributesChanged

Test: Manually by checking that the device works without crashing
Fixes: 236829652
Change-Id: Ib4e615f6e4eb44d0fc4fb753b27a04b908e7bd24
2022-07-04 13:25:12 +00:00
Andrey Epin
883bb34d07 ResolverDrawerLayout to request layout when needed.
The list of fields that directly or undirectly and/or condtionally
influence view's layout:
onMeasure:
  mMaxWidth

onLayout:
  mTopOffset
    <- mCollapseOffset
  mCollapseOffset
    <- mCollapsibleHeight
      <- mShowAtTop
      <- mMaxCollapsedHeightSmall
      <- mCollapsibleHeightReserved
      <- mSmallCollapsed
      <- mAlwaysShowHeight
    <- mOpenOnLayout
    <- mShowAtTop
All their assigments is revied and discovered issues is addressed in
this CL (plus small adjustements suggested by the static code inspector).

Fix: 237718103
Test: Unit tests + manual.
Change-Id: I405b7a48dac18e090a055f3187004b3a8565586c
2022-07-01 11:49:43 -07:00
Nicolò Mazzucato
e8d8c8efed Merge "Add jank monitoring for taskbar appearing and disappearing" into tm-qpr-dev am: 0180bb596f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18805631

Change-Id: Iba25ae8912465d339211162aba000740093a1328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 15:37:01 +00:00
Nicolo' Mazzucato
b612fe0a58 Add jank monitoring for taskbar appearing and disappearing
Bug: 228969045
Test: record a perfetto trace and make sure the interaction is there
Change-Id: I9bb46cd92a373ec4cfe43954cc66d983f1b380b1
2022-06-28 08:27:29 +00:00
Treehugger Robot
4a0a36425a Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." 2022-06-22 19:39:59 +00:00
TreeHugger Robot
5434f98a11 Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-dev-plus-aosp 2022-06-22 00:12:27 +00:00
Chris Wailes
80f33ec0a9 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 am: ca5df431c5 am: 8b193879c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: Icdf31b641bec9b3f39591586086640868c30f9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:45:53 +00:00
Chris Wailes
8b193879c6 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 am: ca5df431c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: I96acf477bb004cad2ee6ac87a98a1d7176c498ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:26:54 +00:00
Chris Wailes
ca5df431c5 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: I98e8a58abbbc5ac8ba5b8caad4dcb365495209c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:08:53 +00:00
Shumao Hou
e57b8c1749 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
(cherry picked from commit 79c3779bb1)
2022-06-21 20:57:40 +00:00
TreeHugger Robot
539e79f468 Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-qpr-dev-plus-aosp 2022-06-21 20:22:34 +00:00
TreeHugger Robot
de32fd8eba Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-d1-dev-plus-aosp 2022-06-21 20:22:30 +00:00
Vadim Caen
c21bb6a1b1 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44 am: 9e2a134dde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: Id3181b7f8155aa5e3bda8c1604fd70a0cd290601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 22:35:13 +00:00
Vadim Caen
f238735a02 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: Ia11db8e296958a5a8598e29d8719ba38784e14e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:19:56 +00:00
Vadim Caen
9e2a134dde Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I367c3888b726f0f7c83d382881741478e715d549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:19:32 +00:00
Vadim Caen
b38e19fdc3 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I8054556537104bb80d940272b367ed9b8ffa520c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:02:34 +00:00
Vadim Caen
a2e45f1ed1 Prevent callback registration when back flag is disabled
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
Merged-In: I54d843f11130a78ed5a68cbe4722e601a2086ee1
(cherry picked from commit aa48dc3c2d)
2022-06-20 11:40:18 +02:00
Nick Chameyev
b82facd63d Merge "Update the number of columns on config change in share sheet" into tm-qpr-dev am: f3697ffee8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799656

Change-Id: Ia7a44b241dc7dffdcb49afc157752443e60ebbd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:33:28 +00:00
Nick Chameyev
f3697ffee8 Merge "Update the number of columns on config change in share sheet" into tm-qpr-dev 2022-06-20 09:24:35 +00:00
Shumao Hou
7da46301e1 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
(cherry picked from commit 79c3779bb1)
2022-06-17 22:02:30 +00:00
Shumao Hou
2814d58002 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
(cherry picked from commit 79c3779bb1)
2022-06-17 21:58:37 +00:00
Chris Wailes
e05e1ffffe Add System Properties based settings for USAPs
This CL updates the configuration handling for USAP system properties.

Test: Build; flash; set property; check device state
Bug: 161725679
Change-Id: Ia1f6c4f4f7b8798d9c906953629bed61ce618f54
2022-06-17 10:49:17 -07:00
Hui Yu
65ff3763ac Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c am: 9e578ed3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: Ifdcc7b3a444773a428bdc8361c358aac62f2151a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:37:19 +00:00
Xin Li
195b02b570 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Hui Yu
fa083fb1c1 Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: If407fc52cef5e9c478a39b275cb5f9ea808e9bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:32:30 +00:00
Hui Yu
9e578ed3ac Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: I94c52ccbdc1b734d16f3dc9f99023e7a17973000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:32:18 +00:00