Commits · a36d3be0095249e5e6a21468980c8a972764aa6c · Farzin Kazemzadeh / platform_frameworks_base-old

Mar 28, 2023

Update ActivityIntentHelper to use PendingIntents directly am: · a36d3be0

John Wu authored 2 years ago

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

Change-Id: I3f54a52572868d487b54061685a1a0e16b5d0856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a36d3be0

Mar 27, 2023

Merge "Proper PendingIntent.queryIntentComponents implementation" into tm-dev am: · b49b2caa

Beth Thibodeau authored 2 years ago

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

Change-Id: Ic9d183a702beb4d6f44a9d132a750a222913711e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b49b2caa

Update ActivityIntentHelper to use PendingIntents directly · 3ee3b7a2

John Wu authored 2 years ago

Use PendingIntent.queryIntentComponents to query components instead of
going through the intent contained. This allows package manager to
properly determine the identity to perform the intent resolution.

Bug: 238415222
Bug: 271845008
Test: manual
Change-Id: I0dd32765755732a7a9141e3be2b04b7eed696928
Merged-In: I0dd32765755732a7a9141e3be2b04b7eed696928

3ee3b7a2

Merge "Proper PendingIntent.queryIntentComponents implementation" into tm-dev · eba590b2
Beth Thibodeau authored 2 years ago

eba590b2

Proper PendingIntent.queryIntentComponents implementation · 6c4a347b

John Wu authored 2 years ago

PendingIntent.queryIntentComponents currently does not take the pending
intent creator UID into account when performing component resolution.
This will return incorrect results, since explicit intents with
non-matching intent filter can only be resolved if the sender is the
same UID as the target component.

Bug: 238415222
Bug: 271845008
Test: atest CtsContentTestCases:PackageManagerTest
Change-Id: Ib4e1c04c8de4e9bcee35d584dfb213954ec65449
Merged-In: Ib4e1c04c8de4e9bcee35d584dfb213954ec65449

6c4a347b

Mar 23, 2023

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 7bf99cd7

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours am: f6228ade -s ours am: 6b7c7515 -s ours am: 021834cc -s ours am: 906538e2 -s ours am: 5630fddb -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I3598d3ad0726cb64da8211d931ffac626610bb98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7bf99cd7

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 15142e54

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: 92114886 -s ours am: de18b4c0 -s ours am: e6178d53 -s ours am: 8415146a -s ours am: 568ad7ab -s ours am: 81609aef -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I8103f74de85e3d7e95d40ab1f2e4435fd97fa79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

15142e54

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 87fbce55

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours am: 3e7ab1d8 -s ours am: 38c7b8c9 -s ours am: ef080cb4 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: Ia0e5829a785923d5d5a4438ba337f6bbd45d5263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

87fbce55

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 5119853f

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours am: 9b2f1f26 -s ours am: a772442b -s ours am: 47eec46b -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I80d73a0e2043e6761d96e4d2e9f189c510ac044b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5119853f

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 5630fddb

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours am: f6228ade -s ours am: 6b7c7515 -s ours am: 021834cc -s ours am: 906538e2 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I06a278df5db718ae8b3770966b175e5cba600ad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5630fddb

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 81609aef

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: 92114886 -s ours am: de18b4c0 -s ours am: e6178d53 -s ours am: 8415146a -s ours am: 568ad7ab -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I15f4bd938d7e476438913642a48ffea25bac3f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

81609aef

[automerger skipped] Merge "Check key intent for selectors and prohibited... · ef080cb4

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours am: 3e7ab1d8 -s ours am: 38c7b8c9 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I6fa541338830e43035ae49ed875eb96defd731fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ef080cb4

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 47eec46b

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours am: 9b2f1f26 -s ours am: a772442b -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I7a475b8ba5c27420221cf8af157ece8eae21a90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

47eec46b

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 906538e2

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours am: f6228ade -s ours am: 6b7c7515 -s ours am: 021834cc -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: Ie684124ac9a21c754e78a88cc673cc4e80e7b669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

906538e2

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 568ad7ab

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: 92114886 -s ours am: de18b4c0 -s ours am: e6178d53 -s ours am: 8415146a -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I43aa118188af04f6175276ac4886e7237d3e6d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

568ad7ab

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 38c7b8c9

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours am: 3e7ab1d8 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I045decb6a9fd1f44f4ec8c4167932a8aba662e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

38c7b8c9

[automerger skipped] Check key intent for selectors and prohibited flags am:... · a772442b

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours am: 9b2f1f26 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I02411f699f6f5c8d77c930fbd53e5ff70cfd7ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a772442b

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 021834cc

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours am: f6228ade -s ours am: 6b7c7515 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I772573dcf439c8893ab898bda6bcabca98ad6e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

021834cc

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 8415146a

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: 92114886 -s ours am: de18b4c0 -s ours am: e6178d53 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: Ibf041cd354f52efeefca00ea0f6d6cf6f762d0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8415146a

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 3e7ab1d8

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: Ic8cec3bd3e1ae31e117cedccef18ca494e1932ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3e7ab1d8

[automerger skipped] Check key intent for selectors and prohibited flags am:... · 9b2f1f26

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I9804721f0dcc86613afa94d303c6d7acd10730c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9b2f1f26

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 2e644be6

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-dev am: b013c0e9 -s ours am: b638305e -s ours am: ece9bea2 -s ours am: f8d54a1e -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: Ifb1eb7fedc61ef2fe827603b963f83e4da108495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2e644be6

[automerger skipped] Merge changes from topic... · 547ea73b

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge changes from topic "cherrypicker-L30100000958833107:N04600001341391576" into sc-qpr1-dev am: ef1b9f7d -s ours am: dfc830bb -s ours am: 3a383111 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: I88c89403704c22c510148b61ad22b6112eb9b356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

547ea73b

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 6b7c7515

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours am: f6228ade -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I8d1ce03431d57a683ad7efda284acdbfa9493dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6b7c7515

[automerger skipped] [automerge] Check key intent for selectors and prohibited... · 7cb0145c

Brian Lee authored 2 years ago

[automerger skipped] [automerge] Check key intent for selectors and prohibited flags 2p: 5e01f68b am: 01d2cbbe -s ours am: d73721f0 -s ours am: 76c22377 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: I1e4c882f78f432b92ac1e4cd93b0ed781122b34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7cb0145c

[automerger skipped] Check key intent for selectors and prohibited flags am:... · e6178d53

Brian Lee authored 2 years ago

[automerger skipped] Check key intent for selectors and prohibited flags am: 92114886 -s ours am: de18b4c0 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: Ibf94f3c7470375a290743633aa1986f77ea88d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e6178d53

[automerger skipped] Merge "Check key intent for selectors and prohibited... · 5eb26bd5

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I087b3e226943a3f85e1261b0e58a210fa068659f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5eb26bd5

[automerger skipped] Merge "Check key intent for selectors and prohibited... · f6228ade

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515b -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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



Change-Id: I4d526564e42e106dbb87cf99dfffcac2f05c5c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f6228ade

[automerger skipped] Check key intent for selectors and prohibited flags am: -s ours · de18b4c0

Brian Lee authored 2 years ago

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2 is already in history

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

Change-Id: Ida1ddbdda283fb6fe3d2446e1e59903a8cad53cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

de18b4c0

[automerger skipped] Check key intent for selectors and prohibited flags am: -s ours · d1e2d06c

Brian Lee authored 2 years ago

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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

Change-Id: I60e89ba16b66ebcf8533ce1cca6edd91e816b2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d1e2d06c

Merge "Check key intent for selectors and prohibited flags" into rvc-dev · c162515b
Dmitry Dementyev authored 2 years ago

c162515b
Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev · 7b2b2630
Dmitry Dementyev authored 2 years ago

7b2b2630

[automerger skipped] Merge "Check key intent for selectors and prohibited... · f8d54a1e

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-dev am: b013c0e9 -s ours am: b638305e -s ours am: ece9bea2 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: Ie4de954ece915ce7ddb30b8d4dd972c389613161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f8d54a1e

[automerger skipped] Merge changes from topic... · 3a383111

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge changes from topic "cherrypicker-L30100000958833107:N04600001341391576" into sc-qpr1-dev am: ef1b9f7d -s ours am: dfc830bb -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: Icb0c59408fe5945b7340ec1584d15fbcd9013839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3a383111

[automerger skipped] [automerge] Check key intent for selectors and prohibited... · 76c22377

Brian Lee authored 2 years ago

[automerger skipped] [automerge] Check key intent for selectors and prohibited flags 2p: 5e01f68b am: 01d2cbbe -s ours am: d73721f0 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: I6e0bfbcd2e710b0a7707f6e23e4770bc75d6138e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

76c22377

[automerger skipped] Merge "Check key intent for selectors and prohibited... · ece9bea2

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-dev am: b013c0e9 -s ours am: b638305e -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I8bbbb3c31fd44d0a60254f401284319e57eeb6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ece9bea2

[automerger skipped] Merge changes from topic... · dfc830bb

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge changes from topic "cherrypicker-L30100000958833107:N04600001341391576" into sc-qpr1-dev am: ef1b9f7d -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: Ifc0da80d97dd7ea515b4c0d2fdede8e124258926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dfc830bb

[automerger skipped] [automerge] Check key intent for selectors and prohibited... · d73721f0

Brian Lee authored 2 years ago

[automerger skipped] [automerge] Check key intent for selectors and prohibited flags 2p: 5e01f68b am: 01d2cbbe -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: I75ffe470d2eb22e9c91a7102f32794f081888e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d73721f0

[automerger skipped] Merge "Check key intent for selectors and prohibited... · b638305e

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into sc-dev am: b013c0e9 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 5e01f68b is already in history

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



Change-Id: I6f650b28fbc4b913362ee27bd0d793f92442e987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b638305e

[automerger skipped] Merge "Check key intent for selectors and prohibited... · c5dd96e2

Dmitry Dementyev authored 2 years ago

[automerger skipped] Merge "Check key intent for selectors and prohibited flags" into tm-dev am: 091bcbd5 -s ours

am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 1ef76e11 is already in history

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



Change-Id: I31930fbf36505c0c0f841a5ecdb437bbd4a2e96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c5dd96e2