Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
891,995 Commits 3 Branches 0 Tags
00a7e67eaf142bdc65e30b981c2fd3ef3abfb0ce
Commit Graph

891995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
552e3a921d Merge "Fix NPE when re-registerNetworkCallbacks" into udc-dev am: feb922b0ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22598874

Change-Id: Id7d97c258ded571d2dc1568fe87cbf755856eb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 20:37:19 +00:00
Dmitry Dementyev
fdde2e60a2 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d am: d0ff6dcb61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: I1efde1d2314c1819fcd2a7db1ba449c9f85c09d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 20:36:15 +00:00
Kholoud Mohamed
a42e8e4bc7 Migrate existing policies to the policy engine 
Migrated policies that are stored in DPMS only

Fixes: 258811766
Bug: 273494642
Test: btest a.d.c.UserControlDisabledPackagesTest#setUserControlDisabledPackages_policyMigration_works*
Test: btest a.d.c.PermitInputMethodsTest#setPermittedInputMethods_policyMigration_works*
Test: btest a.d.c.AccountManagementTest#setAccountManagementDisabled_policyMigration_works*
Test: btest a.d.c.ScreenCaptureDisabledTest#setScreenCaptureDisabled_policyMigration_works*
Change-Id: I320ba9a56e66ce2bf1833ff6e33b1c3d9e36013e
Merged-In: I320ba9a56e66ce2bf1833ff6e33b1c3d9e36013e
 2023-05-09 20:12:50 +00:00
Treehugger Robot
feb922b0ce Merge "Fix NPE when re-registerNetworkCallbacks" into udc-dev 2023-05-09 20:12:11 +00:00
Reema Bajwa
b89ee43ee3 Propagate SEET_ALLOWED_PROVIDERS permission to get flow 
Test: Built locally
Bug: 281599707

Change-Id: I94db6c7a3b68ac2dc40da09be2a777225bdeb169
 2023-05-09 19:59:49 +00:00
Reema Bajwa
b9ff3176a1 Merge "Revert usage of ParceledListSlice in UI interface" into udc-dev am: a24961f087 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23057331

Change-Id: I80fe75141548d7bba88fe2ddad790bb37c0aed07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:58:03 +00:00
Arpan Kaphle
6ca8ce8ab2 Sets up Emit for Auth Entry 
This CL focuses on setting up the emit for the authentication entry
metrics, by identifying where in the API flow this may occur.
Further CLs will add more details.

Bug: 271135048
Test: Build + Won't Submit before E2E Test
Change-Id: I82c2f7477f585b0c43a6cf06e7a1f4982cbf5907
 2023-05-09 19:57:27 +00:00
Treehugger Robot
0f08418605 Merge "Flip the debug flag in HandwritingModeController" into udc-dev am: c7e28baf2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089182

Change-Id: Id9f77346d33adef67409e5213d0b04edc123fd05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:57:27 +00:00
Reema Bajwa
a24961f087 Merge "Revert usage of ParceledListSlice in UI interface" into udc-dev 2023-05-09 19:57:23 +00:00
Evan Laird
89926c2cbf Merge "[Sb refactor] Ensure config is fetched on flow start" into udc-dev am: 06341694a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088704

Change-Id: Ifbfa0d7a15bc2ff4020cca41550e95ac86ac2968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:56:12 +00:00
Ioana Alexandru
3a5050597d [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 92b4cfb6b6 -s ours am: 52521e07bf -s ours am: d533509908 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I88ecde6ab22809756e4c6be0d0a55ef7fe2af9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:59 +00:00
Ioana Alexandru
ff0f6188d4 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: c05570e2b7 -s ours am: 3c6820b343 -s ours am: c1eb70a38e -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I645e76f82acfc7ea3f420ebe1f1e5415fccd745b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:56 +00:00
Ioana Alexandru
cc6484ec20 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: 7e06b4b84f -s ours am: cd6045b190 -s ours am: 9d0ca9f207 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Id83530acf78fe1f9894ead535d5a10c464fe5028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:26 +00:00
Dmitry Dementyev
d0ff6dcb61 Ignore failing RecoverableKeyStoreManager tests. am: ca24397a4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111846

Change-Id: Ic60f72ac520c153c5686e3576b68478bc4d19e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:22 +00:00
Ioana Alexandru
c5692b3e24 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 1aea31df53 -s ours am: 10ba244776 -s ours am: 3b367773bd -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Iac768b52043dc1977dc4aac286b89e8a82ad934b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:55:22 +00:00
Arpan Kaphle
9cfa89f4ed Handling sequential auth entries in metrics 
Since auth entries could repeat multiple times, maybe across multiple
providers, this ensures that the aggregate and single case properly
handle such sequential amounts of calls and emit them accordingly.

Bug: 271135048
Test: Build and Won't Submit without E2E Test
Change-Id: If4b77e0865761c22bd2e63b333bd46647f25d976
 2023-05-09 19:52:41 +00:00
Arpan Kaphle
39942cfa7e Extends the CandidateAverageMetric with Auth Entry 
This adds the auth entries response collective into the candidate
average metric, thereby creating a full aggregate for the response
information. It also sets up the Get emit logic, and is a step towards
final completion of the collection system.

The threaded timed get emit system was removed in favor of an immediate
function-based buffer/queue logging system that will be added once all
changes are in.

Bug: 271135048
Test: Build and Won't Submit without E2E Test

Change-Id: I17ac83de23dee1486a10d7ce02bfc334ceef5581
 2023-05-09 19:29:54 +00:00
Treehugger Robot
c7e28baf2b Merge "Flip the debug flag in HandwritingModeController" into udc-dev 2023-05-09 19:29:46 +00:00
Evan Laird
06341694a0 Merge "[Sb refactor] Ensure config is fetched on flow start" into udc-dev 2023-05-09 19:28:12 +00:00
Vlad Popa
f1d5f557a7 Update sound dose strings 
Also in order to use the notification string for 5X dose removed the
dialog warning and only showing the notification as defined by UX.
UX doc for reference: https://docs.google.com/document/d/16mceIU3kcPBE0VaWYt3OWrpG7HsLDB5j1Pa_CX0Pi7Y/

Test: atest VolumeDialogImplTest CsdWarningDialogTest
Test: atest GtsInteractiveAudioTestCases -- --module-arg GtsInteractiveAudioTestCases:instrumentation-arg:ENABLE_MANUAL:=true
Bug: 244633303
Change-Id: I7efcb5b8d3c059d04de7f8812232f8383a86cff6
 2023-05-09 21:10:33 +02:00
Ioana Alexandru
d533509908 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 92b4cfb6b6 -s ours am: 52521e07bf -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: Id4d26573493f18d6a9873f2b9f767a04276615af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:05:53 +00:00
Ioana Alexandru
c1eb70a38e [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: c05570e2b7 -s ours am: 3c6820b343 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I30ae2f43aefd5385e37a700d5235bf6c2b4120c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:05:40 +00:00
Ioana Alexandru
9d0ca9f207 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: 7e06b4b84f -s ours am: cd6045b190 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: I4b67ba73876c691ed325805156ba9c53d53c726e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:05:13 +00:00
Ioana Alexandru
3b367773bd [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 1aea31df53 -s ours am: 10ba244776 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: I3c5a992da5a2d7e3350e39253e78f6149a503238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 19:05:00 +00:00
Ady Abraham
cab4afeb64 hwui: send TextureView hint to SF 
So that SF could use this hint when choosing the refresh rate.
SF would only try to heuristically calculate the frame rate of a layer
when TextureView is updating. This fixes a bug where SF tries to
heuristically calculate the frame rate for UI animations but fails
due to long frames.

Bug: 280249265
Test: Playing a video on Facebook and observe refresh rate
Test: go/cb-pcmark

Change-Id: I0d54d62b97ff48583fbe3cc0da188fe85810fd5e
 2023-05-09 11:58:22 -07:00
Treehugger Robot
a0d7737aa6 Merge "Ignore failing RecoverableKeyStoreManager tests." into udc-dev am: bbfaff3024 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111844

Change-Id: I1aa5a0256111b41b3610e853dff4cf5482f53cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:47:30 +00:00
Josep del Río
9d3dc6f050 Merge "Support ghe with upturn on ANSI keyboards using Ukrainian layout" into udc-dev am: 1e2ba4dd76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22990116

Change-Id: I6e62b117a809e5fbc1d801e9c9cc9945d0611690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:46:29 +00:00
Vlad Popa
75213957cf CSD: Set the default csd property to false 
The current logic is disabling the safe volume implementation whenever
the sound dose is enabled. This can be problematic since devices that
support offloading and do not have the HAL sound dose implementation
will not be able to certify with any safe hearing standards.
Vendors can overlay the config_safe_sound_dosage_enabled flag when they
support sound dose.

Test: manual
Bug: 276884465
Change-Id: Ica7b9fc2e201bd47f39ca4688df18fe7ebcf5e4a
 2023-05-09 20:45:48 +02:00
Mugdha Lakhani
5ee254bf11 Add support for Input ads from the SDK runtime. 
Symtom: EditText created from the SDK runtime is not able to accept
input using the soft keyboard. The root cause is a failed check in
ImeService when it tries to match the caller uid with the uid PM
associates with the sdk sandbox package. Since SDK sandbox package can
be running in a process that can have a UID from a range, rather than a
single UID, this check often fails.

Updated the check to use a PackageManager method that understands this
nuance about sdk sandbox package and ensures the UID falls within the
range of sdk sandbox UIDs.

Bug: b/242985591
Test: Using the SDK sandbox manual test app.
Change-Id: I3da937bf379f39c8204db5b7d7d1c41c6a6e942e
 2023-05-09 18:45:18 +00:00
Treehugger Robot
bbfaff3024 Merge "Ignore failing RecoverableKeyStoreManager tests." into udc-dev 2023-05-09 18:40:12 +00:00
Priyanka Advani
8cfb13ccf8 Revert "Carrier text: add LogBuffer debug logs" 
Revert submission 23033485

Reason for revert: Probable culprit for b/281706473

Reverted changes: /q/submissionid:23033485

Change-Id: I14736a3753419a4bf592536b74d1a025e0384877
 2023-05-09 18:37:34 +00:00
Priyanka Advani
12c0f856b9 Revert "Add @SysUISingleton to repository switcher classes" 
Revert submission 23033485

Reason for revert: Probable culprit for b/281706473

Reverted changes: /q/submissionid:23033485

Change-Id: Ie67c963784bdf3dc25954f950a551c4a7aa97389
 2023-05-09 18:37:34 +00:00
Josep del Río
1e2ba4dd76 Merge "Support ghe with upturn on ANSI keyboards using Ukrainian layout" into udc-dev 2023-05-09 18:35:55 +00:00
Michał Brzeziński
d842033b5c Merge "Small improvements in code cleanliness" into udc-dev am: 8367afeb36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22814564

Change-Id: Ie6444a7e6dfaf6849071876bfaab100f63c18730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:33:54 +00:00
Ioana Alexandru
1afa71eaf4 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 9f31dc6b58 -s ours am: 10edc4bfc4 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I7b1bb82ca50bb864e2e0bd20142ab83781fa4196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:33:42 +00:00
Ioana Alexandru
85d98f02c9 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: 62497a5f33 -s ours am: f96c365e0f -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I8a18ebabdd50812244be372b29bdc39810d8ea69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:33:39 +00:00
Automerger Merge Worker
d3da2de260 Merge changes from topic "am-a2fad34aa94a482192cdf41f97562e31" into udc-dev am: 5cca12a70f -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 19a0549e77 is already in history

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

Change-Id: I26d69c6b46b8ff130932894f59fcf6074c25c9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:33:26 +00:00
Ioana Alexandru
1254a2c8c3 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: c75c2a049c -s ours am: cf520c2a0e -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Iedae644b9eb31b78a2e0332bc0ba3befd6ac8b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:33:23 +00:00
Treehugger Robot
88ab64b522 Merge "Camera: Use characteristic from user app for extension" into udc-dev am: 2b956fe212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22955857

Change-Id: Ie0a82f5cf40792c8289f0f1fce4668f4d457935d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:30:35 +00:00
Vania Januar
07ce2d0c4a Merge "Do not dismiss USI notification when stylus is bluetooth connected." into udc-dev am: d4bb41170a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22990477

Change-Id: I8ff4ea0a9591189750641b007e0f9a616605b554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:29:54 +00:00
Treehugger Robot
29ff4b2590 Merge "Use AHardwareBuffer_getAllocationSize" into udc-dev am: 4d1a1393fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23064442

Change-Id: I7ed8cd6190e8a1a752bd4a9c60c162643b5b17d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:29:11 +00:00
Michał Brzeziński
8367afeb36 Merge "Small improvements in code cleanliness" into udc-dev 2023-05-09 18:29:09 +00:00
Oleg Petšjonkin
412374c7b3 Merge "Default DisplayInfo crash in getRefreshRate fix" into udc-dev am: d86979d3f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23106938

Change-Id: Ie28b49cbb961cc7e8d88753941a458ba6e4ed2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:26:35 +00:00
Ioana Alexandru
52521e07bf [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 92b4cfb6b6 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: Idd9169223e968dfa9bbde9f3bb24691b462b452e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:47 +00:00
Ioana Alexandru
3c6820b343 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: c05570e2b7 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I089a6adb253dddd350e5d78e8dc5c67bddb7cc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:42 +00:00
Ioana Alexandru
cd6045b190 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: 7e06b4b84f -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: Ic230082cccf3490bf75dca9c860743363dac9f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:29 +00:00
Ioana Alexandru
10ba244776 [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 1aea31df53 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history

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

Change-Id: I4a86346ce4521000d893d2058e7f99ba25bcd11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:25 +00:00
Treehugger Robot
f263a277cc Merge "Check lineHeight without cast" into udc-dev am: cd819a4aef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090895

Change-Id: Ib175018e1f4befc849ac099d99c11ec4a28e2890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:25:03 +00:00
Ioana Alexandru
10edc4bfc4 [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 9f31dc6b58 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: I4dc1cc3cbb0fdf8456e8f3e31e5b11c6e18fe336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:24:58 +00:00
Ioana Alexandru
f96c365e0f [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours am: 62497a5f33 -s ours 
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

Change-Id: Icfcdb5d7738eac2a94b4e2cfc2847af393b4b8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:24:40 +00:00