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
András Kurucz
0856591b96 [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours am: 2fd58ff889 -s ours am: 21da38fb61 -s ours am: 608ee7b364 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history

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

Change-Id: I802d5f1874ef30314f524401ebcbcde75427777a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 16:09:01 +00:00
András Kurucz
da1299ad65 [automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours am: 07da6d191d -s ours am: 5b5df7f92d -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history

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

Change-Id: Ia9f5e7f1c54410a02a267a6ac92f3628c89ac14b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 16:07:44 +00:00
Helen Qin
2fa6eb403d Merge "Fix the result code when the UI is launched for settings." into udc-dev 2023-05-04 16:05:38 +00:00
Valentin Iftime
652801f339 Fix Toast memory leaks 
Use weak references for Context in Toast.TN
 The memory leaks only repro with the legacy (non SystemUi Toasts)

Test: atest ToastWindowTest
 atest ToastPresenterTest
 atest ToastUITest
Bug: 204272000
Change-Id: Ia0112978f866ca4c98e48c41b09849b5d5a49276
 2023-05-04 18:05:37 +02:00
Caitlin Shkuratov
a0052e490e [SB Refactor] Add null checks around network capabilities. 
It's still not clear to me how the old code didn't NPE but ag/22820241
started causing some NPEs, because ConnectivityManager specifies that
the NetworkCapabilities from #onCapabilitiesChanged will be non-null
(and the old code didn't check nullability). But, let's fix the crashes
now anyway.

I don't believe we need to fix the new pipeline because I haven't seen
any crash clusters come through.

Fixes: 280169520
Test: atest WifiStatusTrackerTest
Change-Id: I1f100b9d799d220505ac4ebf133ee7aae551f833
 2023-05-04 16:04:08 +00:00
Song Chun Fan
4722cf85eb Merge "[pm] allow debuggable apps to be downgraded on release builds" into udc-dev 2023-05-04 15:59:08 +00:00
Daniel Norman
2ab33f7284 Merge "Revert "Revert "Use PM#isSameApp instead of getPackageUidAsUser.""" into udc-dev 2023-05-04 15:57:25 +00:00
András Kurucz
b4d0503a44 [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd4748 -s ours am: c8e95960f4 -s ours am: 5498223ce4 -s ours am: d0a58c8ae6 -s ours am: 8534aec6a9 -s ours am: 80074780a3 -s ours am: 28d149e7df -s ours am: 30c317c8c7 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: Ib83923397eaa0bba3c6a267ed73c533b1fc85b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:56:17 +00:00
András Kurucz
f0098d4383 [automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours am: d0b98bc699 -s ours am: 657eef512a -s ours am: 1c9b60abeb -s ours am: b91728596a -s ours am: f0d3de3106 -s ours am: decf1e88c5 -s ours am: 68619b2494 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: I0d2d9fdad358a38b2efa542a14fab0d6db16d6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:56:13 +00:00
Ioana Alexandru
029a2ff7da [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-dev am: 08a8ba51f0 -s ours am: 9a0e0e03e1 -s ours am: 123c16e158 -s ours am: 9b24e381e3 -s ours am: 430aa708ff -s ours am: 31859d4fea -s ours am: 3c801bd2e6 -s ours am: 6f4560bf17 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: Ib82bddf2f14d1fbf9dedcf9140c656a7bea95d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:55:59 +00:00
Ioana Alexandru
032256ef7e [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours am: 50682f1b14 -s ours am: e0c773a04a -s ours am: e0d70331ee -s ours am: d8f2b9bf15 -s ours am: 9ee71273ce -s ours am: 89a32ecf42 -s ours am: a728f4aa5f -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I21ff3079546b52d012d0b1bd94886943512e1813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:55:56 +00:00
András Kurucz
ce080b86c8 [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -s ours am: a67b062178 -s ours am: 8f331aabeb -s ours am: 263c1ace7c -s ours am: c37a460a95 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history

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

Change-Id: I5ed79a1d396c6a2cb17cffa814947bd6837f13d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:55:29 +00:00
András Kurucz
7a2cc76647 [automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours am: aa3d7de784 -s ours am: f927708109 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history

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

Change-Id: I9c20ed5b175bad13b0f4230b722afbdce8abd558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:55:26 +00:00
Ioana Alexandru
6c8c855058 [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-qpr-dev am: ae08612d34 -s ours am: a35e57533d -s ours am: d6a74ea7bb -s ours am: d2ef029642 -s ours am: daf33c8f79 -s ours am: 2ab1610d74 -s ours am: 222af85418 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history

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

Change-Id: I1be22c241dc9bdf4064bbd1a05a057519622d63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:55:00 +00:00
Ioana Alexandru
27a4701ec9 [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: a8078ff43d -s ours am: 854e267053 -s ours am: 894d89724f -s ours am: a5b729a26e -s ours am: ff2a2ea2c4 -s ours am: faed4a4ccc -s ours am: 10daa7a8cc -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history

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

Change-Id: I42a982b1390133a0888ce1d8a842671015904076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:54:56 +00:00
András Kurucz
c04ba904d5 [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b28f -s ours am: 71e2d68ec8 -s ours am: ebab1eac42 -s ours am: 53261f62e0 -s ours am: 65d874b540 -s ours am: 1d674ad4f7 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef67c is already in history

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

Change-Id: I9d039472e720310e9768714f5007c8fae22a1639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:54:39 +00:00
Ioana Alexandru
aeb949aa67 Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into sc-dev am: 5d5a3fea89 am: 1e95dd6921 am: 7719f36a11 am: 5a2e6ee0e8 am: f3d18afbb1 am: 7afed09010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I5aadabb8accd6e7bded25f4cfd04f2f8a854aaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:54:23 +00:00
András Kurucz
c9fecd2f33 [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd141 -s ours am: fb809ba82c -s ours am: d393f944b0 -s ours am: a30f11c882 -s ours am: 5451a85fa7 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history

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

Change-Id: Ifbd9312a3d44c1132abec68d5186433e5650816c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:54:07 +00:00
András Kurucz
e6a1784157 [automerger skipped] Truncate ShortcutInfo Id am: d35e2ef67c -s ours am: a3edfb8f6b -s ours am: b575efcc0b -s ours am: 639b41b7c6 -s ours am: 5c90763693 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history

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

Change-Id: I5c901d0cb2861330537da743c6a4520584eac044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:54:03 +00:00
Automerger Merge Worker
7127dab624 Merge changes from topic "am-ca83f9997d2a42c9b8ac75caa9ef9412" into udc-dev am: 133a3bf323 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history

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

Change-Id: I7abe6356e3393f6825e45ee0887bdacf1e3b7de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:45 +00:00
András Kurucz
723c53ac0a [automerger skipped] Merge changes from topic "presubmit-am-b1e9c1f0750d47e9be992038522e27c5" into sc-qpr1-dev am: 92145ceb6e -s ours am: 9a1d8b1b99 -s ours am: 60200ddc26 -s ours am: dff2c77bd9 -s ours am: ebc6b656c9 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history

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

Change-Id: Id176825d7e4ded3caf091be8aab3431fbcb91b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:43 +00:00
András Kurucz
30c317c8c7 [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd4748 -s ours am: c8e95960f4 -s ours am: 5498223ce4 -s ours am: d0a58c8ae6 -s ours am: 8534aec6a9 -s ours am: 80074780a3 -s ours am: 28d149e7df -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: Idd51508a0b851da6c474dceaa09f4f59deddf6de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:37 +00:00
András Kurucz
68619b2494 [automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours am: d0b98bc699 -s ours am: 657eef512a -s ours am: 1c9b60abeb -s ours am: b91728596a -s ours am: f0d3de3106 -s ours am: decf1e88c5 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: I5dc78b1d718150cc5e87be8cb46f12c3dc2618ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:21 +00:00
András Kurucz
d21b09b43e [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd4748 -s ours am: c8e95960f4 -s ours am: 5498223ce4 -s ours am: d0a58c8ae6 -s ours am: 8534aec6a9 -s ours am: 80074780a3 -s ours am: 7ae563558d -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: I8a853ef5fb4eb41cd728db9f44d20497f8e22331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:14 +00:00
András Kurucz
72a3e86f7e [automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours am: d0b98bc699 -s ours am: 657eef512a -s ours am: 1c9b60abeb -s ours am: b91728596a -s ours am: f0d3de3106 -s ours am: d103d1cc75 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: I61e46ba412d4e31c158131ce09467a040eb7da4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:01 +00:00
Ioana Alexandru
6f4560bf17 [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-dev am: 08a8ba51f0 -s ours am: 9a0e0e03e1 -s ours am: 123c16e158 -s ours am: 9b24e381e3 -s ours am: 430aa708ff -s ours am: 31859d4fea -s ours am: 3c801bd2e6 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I72a1d007d36d54a157fd771e50562fd4716f7934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:53:00 +00:00
Ioana Alexandru
a728f4aa5f [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours am: 50682f1b14 -s ours am: e0c773a04a -s ours am: e0d70331ee -s ours am: d8f2b9bf15 -s ours am: 9ee71273ce -s ours am: 89a32ecf42 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I6369e70de810a2bd05078688af77e628ce0fa6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:47 +00:00
Ioana Alexandru
4e9096304b [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-dev am: 08a8ba51f0 -s ours am: 9a0e0e03e1 -s ours am: 123c16e158 -s ours am: 9b24e381e3 -s ours am: 430aa708ff -s ours am: 31859d4fea -s ours am: f580349027 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I0aebfb13b3ec7ffa846f4e7b7fb0e79fb9ea0fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:45 +00:00
Ioana Alexandru
7099b7512e [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours am: 50682f1b14 -s ours am: e0c773a04a -s ours am: e0d70331ee -s ours am: d8f2b9bf15 -s ours am: 9ee71273ce -s ours am: be98751713 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I4979ad650918d8cd943417510f72fdb8c2eb0762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:41 +00:00
András Kurucz
b9a82b6cf2 [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -s ours am: a67b062178 -s ours am: 8f331aabeb -s ours am: 091e1c3905 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history

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

Change-Id: Ia76c037582ff9e7ab9f8a1f05fc019d96a7697af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:23 +00:00
Song Chun Fan
627b75782f Merge "[pm] fail install-existing for apps deleted with KEEP_DATA" into udc-dev am: 5d8b0d27bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22936883

Change-Id: I14dc1f5f5226b55bd8afa96526879e276b418176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:20 +00:00
András Kurucz
8a16661750 [automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours am: 98f823be69 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history

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

Change-Id: I256b02ce4d6083f12ee4388fff29e495c63d7cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:19 +00:00
András Kurucz
c37a460a95 [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -s ours am: a67b062178 -s ours am: 8f331aabeb -s ours am: 263c1ace7c -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history

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

Change-Id: Ide7c77a95aaed89caf38ed893d90e48301efa31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:14 +00:00
Aaron Liu
4bdb3c9427 [automerger skipped] Merge "Set corner radius to 0 when casting" into tm-qpr-dev am: 162ed4af42 -s ours am: 1e714f76ba -s ours 
am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ae4dec818a is already in history

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

Change-Id: Ia808f822ba9771ff228bb7b6fccccb63a4793281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:08 +00:00
Aaron Liu
1bc5ab858a [automerger skipped] Set corner radius to 0 when casting am: ebf8503944 -s ours am: 8762a5d65c -s ours 
am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ae4dec818a is already in history

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

Change-Id: I4b4c1b2e0d1730280a827ef359b46cb229a40db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:52:04 +00:00
Ioana Alexandru
5097485c47 [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-qpr-dev am: ae08612d34 -s ours am: a35e57533d -s ours am: d6a74ea7bb -s ours am: d2ef029642 -s ours am: daf33c8f79 -s ours am: d452934ef0 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history

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

Change-Id: I110d717cd1778bc37465a45844f8c8df0068ccec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:58 +00:00
András Kurucz
f927708109 [automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours am: aa3d7de784 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history

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

Change-Id: Id17fe97ded10c2bd8f2eff8fc519e53f72957949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:58 +00:00
Ioana Alexandru
e394f9cfa5 [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: a8078ff43d -s ours am: 854e267053 -s ours am: 894d89724f -s ours am: a5b729a26e -s ours am: ff2a2ea2c4 -s ours am: 2ae8d4c9fc -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history

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

Change-Id: I2d6cf60d5f43327ac04c7c188b0b217d131745ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:54 +00:00
Ioana Alexandru
1ece9c0a2c Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6 am: 27a94cf804 am: 0114dfd5ab am: 139934df8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I2a5c5476376b831685cd20c09491782288638478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:43 +00:00
András Kurucz
a207bf4e3b [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b28f -s ours am: 71e2d68ec8 -s ours am: ebab1eac42 -s ours am: 53261f62e0 -s ours am: 89376a51cf -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef67c is already in history

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

Change-Id: Ifae6625d71f0e51da571a4288c10ac03b172625f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:35 +00:00
Ioana Alexandru
222af85418 [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-qpr-dev am: ae08612d34 -s ours am: a35e57533d -s ours am: d6a74ea7bb -s ours am: d2ef029642 -s ours am: daf33c8f79 -s ours am: 2ab1610d74 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history

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

Change-Id: I9c9a6a62bf2f4c32dce42b9ec4fd5ad70b6364d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:33 +00:00
Automerger Merge Worker
41ff5a2ed2 Merge changes from topic "am-109f7458af5d41ceb727cd78287dfa75" into udc-dev am: 1c5290f25c -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 8a5223fcd5 is already in history

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

Change-Id: Ib6ae0eb3ad0d899a2872938f039c726d6b2db019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:24 +00:00
Ioana Alexandru
10daa7a8cc [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: a8078ff43d -s ours am: 854e267053 -s ours am: 894d89724f -s ours am: a5b729a26e -s ours am: ff2a2ea2c4 -s ours am: faed4a4ccc -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history

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

Change-Id: I43e20dfaabf6cf599b7b12b6861a04ce18b82095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:21 +00:00
András Kurucz
f411c94d08 [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours am: 2fd58ff889 -s ours am: 538aed39e1 -s ours am: 84e0745483 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history

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

Change-Id: Ibd5fb2a37544ba516570ffc55b7472182992aa41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:21 +00:00
Ioana Alexandru
76e1226f15 Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into sc-dev am: 5d5a3fea89 am: 1e95dd6921 am: 7719f36a11 am: 5a2e6ee0e8 am: fbe2d6af1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I81c8aaac4c132cba7802eb94ddd4dfe15a1722ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:51:07 +00:00
András Kurucz
1d674ad4f7 [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b28f -s ours am: 71e2d68ec8 -s ours am: ebab1eac42 -s ours am: 53261f62e0 -s ours am: 65d874b540 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef67c is already in history

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

Change-Id: I04d51252c47a32c04003788983331e30960a1be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:50:52 +00:00
András Kurucz
83bf723d59 [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd141 -s ours am: fb809ba82c -s ours am: d393f944b0 -s ours am: 0fca42b79b -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history

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

Change-Id: I3353e101d872fa550ae153afd4ad4286f8210f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:50:48 +00:00
Paul Duffin
f1d88f921d [automerger skipped] Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev am: 47727334a1 -s ours am: ace02d1b28 -s ours 
am skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 714d1f1b34 is already in history

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

Change-Id: I0183607555a6d0a7e35648c8874191571af76b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:50:45 +00:00
András Kurucz
39a1daa670 [automerger skipped] Truncate ShortcutInfo Id am: d35e2ef67c -s ours am: a3edfb8f6b -s ours am: b575efcc0b -s ours am: 3c9dcedfb8 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history

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

Change-Id: I1e8a51a7af8d30deb3e22849f61bdc93b64f5ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:50:44 +00:00
Michael Groover
355a949224 [automerger skipped] Update PMService tests to use SDK version 10000 am: f5344f6c4e -s ours am: 2e8db37ae8 -s ours 
am skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 714d1f1b34 is already in history

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

Change-Id: I1480bc1bae6ff3a4a68e42ac3cd9a5c1e3bd69db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:50:42 +00:00