Commit Graph

889635 Commits

Author SHA1 Message Date
Ioana Alexandru
6f79d89e0c [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: 5097485c47 -s ours am: 2d81eb10ea -s ours am: 29eec22f7b -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: Ic0df905a917ed66aa1f042840dcbebf5fc7b2f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:53:38 +00:00
Ioana Alexandru
9e4fde36ca [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: e394f9cfa5 -s ours am: 74ba001d6a -s ours am: 0a19abb550 -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: I504b42bcad2b0a9cce8da2c93481b3c06f8d5ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:53:34 +00:00
András Kurucz
3e53338db2 [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: a207bf4e3b -s ours am: 433b03e5e1 -s ours am: 9d25463fa2 -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: I19a6332bc5e37ba2fe7bb5b457dfc2a6fb4d6854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:53:13 +00:00
Ioana Alexandru
d3baffee2b Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into sc-dev am: 5d5a3fea89 am: 1e95dd6921 am: 7719f36a11 am: 5a2e6ee0e8 am: fbe2d6af1c am: 76e1226f15 am: 03b31f0c03 am: 569737533f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I495923b55c8a4b4ead320bb4d5d5f86163a9971a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:53:04 +00:00
András Kurucz
b76b1dbdfd [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: 83bf723d59 -s ours am: 2f8d20676c -s ours am: 62b1bea4ba -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: Iccdfd082d7e0215c9491060fda1025f1b1cac797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:52:49 +00:00
András Kurucz
9f2024add3 [automerger skipped] Truncate ShortcutInfo Id am: d35e2ef67c -s ours am: a3edfb8f6b -s ours am: b575efcc0b -s ours am: 3c9dcedfb8 -s ours am: 39a1daa670 -s ours am: 93ed2c838d -s ours am: 96a2ea88a0 -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: Iac9261fb8ebc6b3fffc740382fa98394a94e53c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:52:46 +00:00
András Kurucz
a7f2209746 [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: ca4df7b9eb -s ours am: 880614baa8 -s ours am: 9178b213e5 -s ours am: 885860dfb3 -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: I24db6e08bba298e26d93ea71ba6986ba59f13907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:52:30 +00:00
Presubmit Automerger Backend
5feb197590 [automerger skipped] [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5b4 am: 4bc48527c0 -s ours am: c44c03297d -s ours am: f797cc1da7 -s ours am: 5f46214a60 -s ours am: 20f7f005c9 -s ours am: 3f2abe27a0 -s ours am: 4c91875972 -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: Ibb56956b53b16695e3d058cf2c91eea8a514b6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:52:27 +00:00
Ioana Alexandru
ec3162cfcc Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6 am: 27a94cf804 am: 941c874ad9 am: afc2420303 am: df5df55b5b am: d01a8647ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: Id7b8eb761771a516ee44786a6e5fb51357e7f83c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:52:13 +00:00
András Kurucz
71e6f09c37 [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: 0856591b96 -s ours am: 5a3cfa083a -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: I1c5e0a6a5cf8fb93eabbf0234753fb20b4fb7e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:51:46 +00:00
András Kurucz
98faff7352 [automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours am: 07da6d191d -s ours am: 5b5df7f92d -s ours am: da1299ad65 -s ours am: db309e9695 -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: I25bd948919bebaaf67152664f9a9134e423831f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:51:43 +00:00
Helen Qin
4bd231e687 Merge "Fix the result code when the UI is launched for settings." into udc-dev am: 2fa6eb403d am: 9a7c2d1d38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23004525

Change-Id: I2e4e7df7143eec2b9a373c44385043ea6ef28135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:51:08 +00:00
Ioana Alexandru
29eec22f7b [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: 5097485c47 -s ours am: 2d81eb10ea -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: If300135618dacbd17c4ec8250e334181eed04a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:33:55 +00:00
Ioana Alexandru
0a19abb550 [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: e394f9cfa5 -s ours am: 74ba001d6a -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: I293eda02d656cd09485a8b45d2f32a0f77d210eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:33:50 +00:00
András Kurucz
9d25463fa2 [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: a207bf4e3b -s ours am: 433b03e5e1 -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: I48df01559ac0d1c2102528482e1657b58a37a5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:33:31 +00:00
Ioana Alexandru
569737533f Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into sc-dev am: 5d5a3fea89 am: 1e95dd6921 am: 7719f36a11 am: 5a2e6ee0e8 am: fbe2d6af1c am: 76e1226f15 am: 03b31f0c03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I6646463623b98b4b5d96393f2313c420d0baf9ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:33:15 +00:00
András Kurucz
62b1bea4ba [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: 83bf723d59 -s ours am: 2f8d20676c -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: Icf5475dfe4b71155ffc7fb373a09bef76931bde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:32:58 +00:00
András Kurucz
96a2ea88a0 [automerger skipped] Truncate ShortcutInfo Id am: d35e2ef67c -s ours am: a3edfb8f6b -s ours am: b575efcc0b -s ours am: 3c9dcedfb8 -s ours am: 39a1daa670 -s ours am: 93ed2c838d -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: I28891e5b917f0c3578e19474ccc7c7bf8455c04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:32:54 +00:00
András Kurucz
885860dfb3 [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: ca4df7b9eb -s ours am: 880614baa8 -s ours am: 9178b213e5 -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: I66a8b69e739b7dcedff2ed98342c3f8c5f29f92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:32:35 +00:00
Presubmit Automerger Backend
4c91875972 [automerger skipped] [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5b4 am: 4bc48527c0 -s ours am: c44c03297d -s ours am: f797cc1da7 -s ours am: 5f46214a60 -s ours am: 20f7f005c9 -s ours am: 3f2abe27a0 -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: I29f37943cfdd17f4f81b73ee657826b9931054c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:32:31 +00:00
Ioana Alexandru
d01a8647ab Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6 am: 27a94cf804 am: 941c874ad9 am: afc2420303 am: df5df55b5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I91fa8be12889a58eaa45bc4e2e5d65c781dcb48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:32:04 +00:00
András Kurucz
5a3cfa083a [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: 0856591b96 -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: Ib37dc698b22fa42be70e238b138b7afd91fb5223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:31:46 +00:00
András Kurucz
db309e9695 [automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours am: 07da6d191d -s ours am: 5b5df7f92d -s ours am: da1299ad65 -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: I25fc7e6055c3ff29b3ad59423e49eef0d8c65eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:31:41 +00:00
Helen Qin
9a7c2d1d38 Merge "Fix the result code when the UI is launched for settings." into udc-dev am: 2fa6eb403d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23004525

Change-Id: I533bededf4d3d24a8836b4d00e8bd613ab40e01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:31:06 +00:00
Song Chun Fan
8a4f294033 Merge "[pm] allow debuggable apps to be downgraded on release builds" into udc-dev am: 4722cf85eb am: 17a443c9a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908087

Change-Id: I675f737d530f75c0c585bb98626575a132925f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:15:54 +00:00
Daniel Norman
a8aff0db47 Merge "Revert "Revert "Use PM#isSameApp instead of getPackageUidAsUser.""" into udc-dev am: 2ab33f7284 am: 3def977fde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22897479

Change-Id: I2939e60793e16c0e2d0bdd88aaec9186e7f856ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:15:36 +00:00
András Kurucz
e4a74abf75 [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: cddf1d8e38 -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: I00a0a01dd228057738bb31b223559c7332941319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:14:59 +00:00
András Kurucz
5dc10e2c82 [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: 75924d24ca -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: I736d25337eb457dcedda51a51a95b631db039ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:14:56 +00:00
Ioana Alexandru
8fa98008c0 [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: 6c83d313aa -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: Ifc71e1355fb6ce6af4d62647ec898b8bfef1f1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:14:44 +00:00
Ioana Alexandru
b562e2233c [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: 248f380c81 -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: I74dc8c8ba99c03f609a80ab15cf3b0e7e83aa4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:14:41 +00:00
András Kurucz
3721a0a1bc [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: e8b4968dde -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: I6d71c047c5f049da154f8fd99384e539f326d50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:14:16 +00:00
András Kurucz
279b490f70 [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: e995bad870 -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: Id5400880976a434c6539b96a98f94fd6759de695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:14:13 +00:00
Ioana Alexandru
df74977e3b [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: 7d12aab657 -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: Ib4583354f5a770ea43f2e72348e5cd4c2e3bef33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:13:50 +00:00
Ioana Alexandru
8498ce174b [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: b05dc1d868 -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: I962fd0b0de1f16ef04689b0b4d78c3068f7630f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:13:47 +00:00
András Kurucz
b15a6bd9cd [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: c7a70f7546 -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: I48d698e4d1c04690552f02d6a95821671309e373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:13:28 +00:00
Ioana Alexandru
2d81eb10ea [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: 5097485c47 -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: Ic09ec43d0d09175703dd4d39139960d52107317d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:13:22 +00:00
Ioana Alexandru
ca53cb4fc3 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 am: be9fe0bc06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

Change-Id: I59b31bbfc5b767d963bdf04773e46c1d3007b13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:13:13 +00:00
Ioana Alexandru
74ba001d6a [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: e394f9cfa5 -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: I279333c875af47955f6e18a35b4a1d0e49a6f8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:13:04 +00:00
András Kurucz
5054d34d57 [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: c30ad22d0d -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: Ic514b8104a5f324aa68640d0edd96073e3cb7fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:12:55 +00:00
András Kurucz
9a7bbfce01 [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: 690865287a -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: I3d477b25e8b726ea83299e6aba1b2abda4d36927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:12:52 +00:00
Automerger Merge Worker
592ce19285 [automerger skipped] Merge changes from topic "am-ca83f9997d2a42c9b8ac75caa9ef9412" into udc-dev am: 133a3bf323 -s ours am: b8e8d7996d -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: I92b2139dbe4d43f0a862557c71e67d6c4f67fcfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:12:36 +00:00
András Kurucz
d728eb14b8 [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: bfe0e6e7bf -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: Ia8d8f19ff7b6fe2b4fd303e659e5c4e416cf2adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:12:33 +00:00
András Kurucz
433b03e5e1 [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: a207bf4e3b -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: I95e141130c201f32a2a40ef39276e33d98774ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:12:29 +00:00
Ioana Alexandru
03b31f0c03 Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into sc-dev am: 5d5a3fea89 am: 1e95dd6921 am: 7719f36a11 am: 5a2e6ee0e8 am: fbe2d6af1c am: 76e1226f15
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457

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

Change-Id: I1dac3a779bb13b5345843de204b9854ddfa13c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:11:49 +00:00
András Kurucz
2f8d20676c [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: 83bf723d59 -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: I8e3ffc1a14f243d23ee7e74d7a5e5bc50c3eca91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:11:20 +00:00
Aaron Liu
f14fd20ab4 [automerger skipped] Merge "Set corner radius to 0 when casting" into tm-qpr-dev am: 162ed4af42 -s ours am: 1e714f76ba -s ours am: b98d2bebf5 -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: Icb310d9ce295cce7b0acdafe42858e50a28747e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:11:14 +00:00
Aaron Liu
167c6c24c0 [automerger skipped] Set corner radius to 0 when casting am: ebf8503944 -s ours am: 8762a5d65c -s ours am: 18fd64e845 -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: I4359836b9cc6e740d56973f02077d6f0a5e7ccc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:11:11 +00:00
András Kurucz
93ed2c838d [automerger skipped] Truncate ShortcutInfo Id am: d35e2ef67c -s ours am: a3edfb8f6b -s ours am: b575efcc0b -s ours am: 3c9dcedfb8 -s ours am: 39a1daa670 -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: Id50bf74f2cd769aab832b7cd7e6766dcb4e4c2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:11:05 +00:00
András Kurucz
9178b213e5 [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: ca4df7b9eb -s ours am: 880614baa8 -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: I12cb24cb592779a722cd3e2df78908b0c9e75e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:10:34 +00:00