András Kurucz
|
92bdc8137b
|
[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: Iebaa239541dcfc44a7893aa2414722d1bad471ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:15:45 +00:00 |
|
András Kurucz
|
53ed281c95
|
[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: I9e69af06a466b724c5872ee197a6887ad6101876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:15:28 +00:00 |
|
Presubmit Automerger Backend
|
77d81d3cfc
|
[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: I8d50bb3f9dd0e511cf8ef3e5ad40b3e33566ae03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:15:25 +00:00 |
|
Ioana Alexandru
|
d47a515604
|
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: I59ba3e5fbb272eda5fc1ef502043ad4e3943f78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:15:09 +00:00 |
|
András Kurucz
|
8fb33c7ea8
|
[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: I025ace51f86eb6a48584899b22b61ee061248dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:14:54 +00:00 |
|
András Kurucz
|
2449743250
|
[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: I54ca3270e44ddf2e93a82cae5b68f258f2deec4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:14:50 +00:00 |
|
Helen Qin
|
aa8a51b039
|
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: I86ba94003e1d926b872b835bfb8576cccbeac55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:14:34 +00:00 |
|
Song Chun Fan
|
e39eb7bc49
|
Merge "[pm] allow debuggable apps to be downgraded on release builds" into udc-dev am: 4722cf85eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908087
Change-Id: Ifd2b1f45ef24a229ecf68ed150c4e16cdbdd720a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:13:59 +00:00 |
|
Daniel Norman
|
f8f1b35748
|
Merge "Revert "Revert "Use PM#isSameApp instead of getPackageUidAsUser.""" into udc-dev am: 2ab33f7284
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22897479
Change-Id: I57294ddeff3dda118219fb4d39069f8f6469fd6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:13:35 +00:00 |
|
András Kurucz
|
61609b1a1d
|
[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: If413291e927823ddc60baa4c98e56fb7570c5312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:13:19 +00:00 |
|
András Kurucz
|
57d3a775ce
|
[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: I1931fc35c82e60f3cd7ca174b27ca80dbec1df86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:13:14 +00:00 |
|
Ioana Alexandru
|
8c8fb7ffb2
|
[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: Ia732d8011d305641303c5d7b463c9914d59200c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:13:01 +00:00 |
|
Ioana Alexandru
|
7ce92892f5
|
[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: I1fc56bb52c6d1904a84d9002505620efb7be3e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:12:57 +00:00 |
|
András Kurucz
|
c7e4229baf
|
[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: Ib12a5bd938293bc45dbe79340a2db19d7db976f5
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
|
a2e8b4ff73
|
[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: Ie2600842fcad94e972bc9b1d90a0c9a8eb33582f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:12:29 +00:00 |
|
Ioana Alexandru
|
1fc2c3ee64
|
[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: I5aa44755be006ea0fcd83874e7f589707efe4093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:12:12 +00:00 |
|
Ioana Alexandru
|
e959aa63f5
|
[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: I1639e62c2af15dec7de878a7971969853e4950fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:12:09 +00:00 |
|
András Kurucz
|
1f7859aeea
|
[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: If9fd0876a8dc94d70b0e6de7e420a1a04bef876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:11:51 +00:00 |
|
Ioana Alexandru
|
d8bba221fe
|
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: Iae45a175f94b685f3cc836a17b1eef22a3ea0133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:11:32 +00:00 |
|
András Kurucz
|
0605453537
|
[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: I97d0f7d9659b8447888f5e53b44b799d9f3111d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:11:12 +00:00 |
|
András Kurucz
|
e9042955c6
|
[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: I41121be11bf3054c55814634bd9868f7ac84ddcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:11:07 +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 |
|
Automerger Merge Worker
|
1d5b31ed7d
|
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: I7cbdc57da7fa482d0e139dbc6020a62227957764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:10:49 +00:00 |
|
András Kurucz
|
fb83bcd336
|
[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: Ifabeeafc87348e6ba958ea3d05dfd1f06b5a7aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:10:45 +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 |
|
Presubmit Automerger Backend
|
3f2abe27a0
|
[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 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: Id3cf9af23f934da8980b06e194a99f4f07d8e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:10:19 +00:00 |
|
Ioana Alexandru
|
df5df55b5b
|
Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6 am: 27a94cf804 am: 941c874ad9 am: afc2420303
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457
Change-Id: I0a609130d55f35b5b7d8e0c60ad36305510f1c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:09:40 +00:00 |
|
Song Chun Fan
|
1841b754d6
|
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: I6332a08d6b13120440b118e6a987c7fd412fed39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:09:16 +00:00 |
|
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 |
|
Aaron Liu
|
85997e1f72
|
[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: I4b1e4a4e04af7f273fa47f95302e24a304a5365f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:08:54 +00:00 |
|
Aaron Liu
|
c7cebbf086
|
[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: Ic414d864b9824c3017dfd582ee1c537d6b32a4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:07:46 +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 |
|
Ioana Alexandru
|
44a92c8131
|
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: I412e2ad9eabacfbb675941f3cf3f3df3a33fc82a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:07:18 +00:00 |
|
Automerger Merge Worker
|
6badc2b17f
|
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: I2dcfc0b0b4ed354c5adbf9e53d003cc3646adaab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:07:02 +00:00 |
|
András Kurucz
|
27dee315c7
|
[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: I92e170c9c37cc154083f2e439f831bbe622bc42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:06:58 +00:00 |
|
Paul Duffin
|
94e513e6ea
|
[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: Idfbcbedc0d6d74048113512468ebb22d5cfae2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:05:51 +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 |
|
Michael Groover
|
222e9a5465
|
[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: Ifb3ca7d3dc0e9063d5a98e33d0178e67f5ae2cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-04 16:05:01 +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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
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 |
|