Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,134 Commits 3 Branches 0 Tags
8b5d279d9047487e151ea0be91bb1c19042fedd3
Commit Graph

762134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Trask
8b5d279d90 Create ResolverComparatorModel interface. 
Define the API for interacting with comparator model data;
provide implementations for our two current model types; and
(as a first step) re-write our legacy ResolverComparators
to be implemented internally in terms of their new model types.

This is the first CL in a multi-part cleanup of the
AbstractResolverComparator design. This demonstrates that the
role of an AbstractResolverComparator sub-class amounts to
(i.e., Ctrl+F "@Override") some amount of work to prepare model
data; some cleanup; and a set query methods against data that
*really should be* immutable (separated in this CL as the new
ResolverComparatorModel interace). Any remaining responsibilities
of the abstract base class would be better handled (in a subsequent
CL) by an external controller operating on a ResolverComparatorModel
(i.e., preferring composition to inheritance). The async
model-preparation steps should also be separated and cleaned
up (in a later CL).

I believe this to be a pure refactoring with no observable side
effects. While the new design aids in implementing the correct
"immutable snapshot" style, for now I've written the new
ResolverComparatorModel implementations to preserve any possible
quirks in the legacy implementations. Nevertheless, if some
inadvertant behavior change is introduced as a result of this CL,
it's most likely to be a bug-fix where we previously would've mixed
in stale data. A later CL will intentionally pursue those fixes.

Test: atest ResolverActivityTest ChooserActivityTest
Bug: 227486788
Change-Id: If88bf7a5a6394d81c021782d5d9bce7955f1c0e6
 2022-04-08 13:27:11 +00:00
Ayush Sharma
25a9840497 [automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea am: 9f080a0345 -s ours am: c5f7947c18 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: I8f1a1b0fe3a61160d51635901d072495f962eeb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:50:59 +00:00
Baligh Uddin
91314232dc Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev am: f5db132e49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17383042

Change-Id: I66373d28a6d355279fdecc93a2c8c5f155f7a09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:50:16 +00:00
Ayush Sharma
f60667b546 [automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 8feea3a186 -s ours am: 9666473f16 -s ours am: 4c5f8e9ac4 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Ifdb284f97261593cf05f4ea565bdd24e565f02f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:23:28 +00:00
TreeHugger Robot
cce8a7c95a [automerger skipped] Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 am: 276862cf94 -s ours am: e5f832f8e5 -s ours am: bc94d30ad3 -s ours 
am skip reason: Merged-In Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb with SHA-1 46e6944804 is already in history

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

Change-Id: I80cda312d35cea6f1a9edf5a6f258f43e4b30ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:22:53 +00:00
Ayush Sharma
c5f7947c18 [automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea am: 9f080a0345 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: I33d34a3b12fa1bd7d1aa39d720f035bdcb02877f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:22:16 +00:00
Baligh Uddin
f5db132e49 Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev 2022-03-25 13:12:10 +00:00
Ayush Sharma
4c5f8e9ac4 [automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 8feea3a186 -s ours am: 9666473f16 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Ieb2ba35e160a8dfb842122abe3ef11fa6565fb44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:08:07 +00:00
Ayush Sharma
c8bb50d59e [automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 8feea3a186 -s ours am: 9666473f16 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: I238d9327c9e226c59034338330f272c8dfad52b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:08:05 +00:00
TreeHugger Robot
bc94d30ad3 [automerger skipped] Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 am: 276862cf94 -s ours am: e5f832f8e5 -s ours 
am skip reason: Merged-In Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb with SHA-1 46e6944804 is already in history

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

Change-Id: I5b3471c33928553409c27d16438a34aa47755708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:07:52 +00:00
TreeHugger Robot
0e446d3123 [automerger skipped] Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 am: 276862cf94 -s ours am: e5f832f8e5 -s ours 
am skip reason: Merged-In Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb with SHA-1 46e6944804 is already in history

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

Change-Id: I0dbfcc99f7d3d8927b3b5610a6917419bd7be117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:07:46 +00:00
Ayush Sharma
9f080a0345 Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: I22d92503039e830328e6a22a724aeb1286730108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:06:56 +00:00
Ayush Sharma
936c9f03ea Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: I440c492f0199a89f61356c21cc0f0be8d0649199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:54:22 +00:00
Ayush Sharma
9666473f16 [automerger skipped] Fix security hole in GateKeeperResponse am: 5d2176df69 am: 8feea3a186 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Ia97c0894f962af7514323b4ee5d23d3a6567d7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:54:13 +00:00
TreeHugger Robot
e5f832f8e5 [automerger skipped] Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 am: 276862cf94 -s ours 
am skip reason: Merged-In Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb with SHA-1 46e6944804 is already in history

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

Change-Id: I98abf26d89882fef878c2f7aeddd38286db6c0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:53:09 +00:00
Ayush Sharma
25356fba35 Fix security hole in GateKeeperResponse am: 5d2176df69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: Iaa20c957e0944a9ce72c1584d93c352d7ffeee40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:35:07 +00:00
Shiwangi Shah
8184b7f0b5 Merge "Allow unexported receiver registration for sandbox" into tm-dev am: b24001b123 am: fabeb3d697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17377951

Change-Id: I9482a2c074f6dbc412b9f7c4ced5d7d018106db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:34:41 +00:00
Ayush Sharma
8feea3a186 Fix security hole in GateKeeperResponse am: 5d2176df69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: I25eac3659a0c3b0d7c3bf3c53c7e3f503966031f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:34:16 +00:00
TreeHugger Robot
276862cf94 Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344416

Change-Id: Iaca5fda743044360512e7742522b1f5e94c4b862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:34:05 +00:00
TreeHugger Robot
d3e2ea81f2 Merge "Use flag to control the restart period value." into sc-v2-dev 2022-03-25 12:13:19 +00:00
Shiwangi Shah
fabeb3d697 Merge "Allow unexported receiver registration for sandbox" into tm-dev am: b24001b123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17377951

Change-Id: I933fc25fbd66380d3da083f6553415374bf81714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:06:37 +00:00
Shiwangi Shah
875f818e2b Merge "Allow unexported receiver registration for sandbox" into tm-dev am: b24001b123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17377951

Change-Id: Icad91e798d6b7455640555ebc567ee91bd6c8f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:06:24 +00:00
Remi NGUYEN VAN
39a81d2881 [automerger skipped] Merge changes from topic "conn_t_move_tmdev" into tm-dev am: d6474d0e4f am: 6a575b7d14 -s ours 
am skip reason: Merged-In I4c8f84b5b7df057b30ce334a99ce4ce975080020 with SHA-1 91184376c5 is already in history

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

Change-Id: I5830b88fdf9fc01d23c055fa23e4f558f4a9ceb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:01:35 +00:00
Remi NGUYEN VAN
c259a5f3b8 [automerger skipped] Move ConnectivityT to packages/modules am: 73e7bae5b2 am: 2eacf50280 -s ours 
am skip reason: Merged-In I4c8f84b5b7df057b30ce334a99ce4ce975080020 with SHA-1 91184376c5 is already in history

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

Change-Id: I41b0fae34d8673e5b5596350091de77382bad922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:01:15 +00:00
Joanne Chung
6cef0ee727 [automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours am: e7b4cbc1a1 -s ours am: 9b75fdcf80 -s ours am: 1f4ec1d1f2 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history

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

Change-Id: If62d812f85c0c0f4be7e6a99eaa74468a0c0e0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:00:47 +00:00
Joanne Chung
4ea7ae87bc [automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a69404 -s ours am: 69514682c2 -s ours am: 0e733588f7 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: Ib3af80b153aa1b4d2104115e390faa8de7b02d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:00:24 +00:00
Presubmit Automerger Backend
2f1ffd6789 [automerger skipped] [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2 am: 59ed3fba9a -s ours am: 4b6f2150b8 -s ours am: b42e804b0f -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: I43a41b19485afbe3e3ecdbf7643d7ceddf14cda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:00:02 +00:00
Shiwangi Shah
b24001b123 Merge "Allow unexported receiver registration for sandbox" into tm-dev 2022-03-25 11:48:58 +00:00
Remi NGUYEN VAN
6a575b7d14 Merge changes from topic "conn_t_move_tmdev" into tm-dev am: d6474d0e4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378069

Change-Id: I4f13c227a9bce0cb905501402be3803d5e5d4921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:42:10 +00:00
Remi NGUYEN VAN
2eacf50280 Move ConnectivityT to packages/modules am: 73e7bae5b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378068

Change-Id: I38d1d46e40228d9422f0140fa2029822fd6fae37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:42:07 +00:00
Remi NGUYEN VAN
4f07139beb [automerger skipped] Merge changes from topic "conn_t_move_tmdev" into tm-dev am: d6474d0e4f -s ours 
am skip reason: Merged-In I4c8f84b5b7df057b30ce334a99ce4ce975080020 with SHA-1 91184376c5 is already in history

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

Change-Id: Id43134ed87a231039390d518f5e58a859407c9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:40:28 +00:00
Remi NGUYEN VAN
f66716e57a [automerger skipped] Remove stale aidl-export references am: 7c2b259435 -s ours 
am skip reason: Merged-In I4c8f84b5b7df057b30ce334a99ce4ce975080020 with SHA-1 91184376c5 is already in history

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

Change-Id: I29a9d22171f8db701a5ffe9268357302bba5a7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:40:08 +00:00
Joanne Chung
4d6a455ef7 [automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours am: e7b4cbc1a1 -s ours am: 9b75fdcf80 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history

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

Change-Id: Iaf4386e8edad547940117500ec80318e2624cc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:39:23 +00:00
Joanne Chung
1f4ec1d1f2 [automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours am: e7b4cbc1a1 -s ours am: 9b75fdcf80 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history

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

Change-Id: If3a184d2213850b8939a629be0ea8a130da8145d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:39:17 +00:00
Joanne Chung
0e733588f7 [automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a69404 -s ours am: 69514682c2 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: I9172ac890c89cc026789b6839c7ac569fb7c6747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:39:03 +00:00
Presubmit Automerger Backend
b42e804b0f [automerger skipped] [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2 am: 59ed3fba9a -s ours am: 4b6f2150b8 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: Ib9b8af9e97dfff57c0ef636eee5a3b1fd13a8ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:39:01 +00:00
Joanne Chung
a578706690 [automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a69404 -s ours am: 69514682c2 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: I1badd7e1d6aef320c43b1d69e7deaf0067296b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:38:34 +00:00
Presubmit Automerger Backend
ad44f9f406 [automerger skipped] [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2 am: 59ed3fba9a -s ours am: 4b6f2150b8 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: I23d9a5cb2d3ce981475ad37bf028e01444a6d941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:38:08 +00:00
Remi NGUYEN VAN
d6474d0e4f Merge changes from topic "conn_t_move_tmdev" into tm-dev 
* changes:
  Remove stale aidl-export references
  Move ConnectivityT to packages/modules
 2022-03-25 11:19:02 +00:00
Joanne Chung
9b75fdcf80 [automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours am: e7b4cbc1a1 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history

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

Change-Id: I37eb065e8677dc96a4302467e344953aceb8f111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:14:49 +00:00
Joanne Chung
69514682c2 [automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a69404 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: I79f3e31666fe24ae5281296578bdcfa0961613f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:14:13 +00:00
Presubmit Automerger Backend
4b6f2150b8 [automerger skipped] [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2 am: 59ed3fba9a -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history

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

Change-Id: I2a97030f73cb880710e4989a37321cbcc7097c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:14:00 +00:00
Joanne Chung
e7b4cbc1a1 [automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history

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

Change-Id: I210ba0fdacd35ae47c02f31311fb48fd7db8ce2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:13:58 +00:00
Kholoud Mohamed
695122bffd Merge "RESTRICT AUTOMERGE add requiresAPI annotation for DPM#getString" 2022-03-25 10:57:09 +00:00
Kholoud Mohamed
06b8eb20f3 Merge "RESTRICT AUTOMERGE Expose getString APIs as public" 2022-03-25 10:57:09 +00:00
Joanne Chung
c1840b3fd5 Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev 2022-03-25 10:54:51 +00:00
Joanne Chung
a719a69404 Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2
  Trusted Hotword: Allow disabling periodic restarts.
 2022-03-25 10:54:51 +00:00
Tiger Huang
fbd7dd1d03 Merge "Check mAttachInfo.mSystemUiVisibility to see if a SysUI flag exists" into tm-dev am: d5d86912aa am: f1d11ac3bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17394904

Change-Id: I7a87236044c0eecfc244d36f87916698a5caefc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:48:57 +00:00
Nick Chameyev
0acbcce27b Merge "Continue folding animation after it cancelled if necessary" into tm-dev am: 54c3d1b82e am: 49eb88c18b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346988

Change-Id: I32198b29bb307d12a055e1229882ddc3ac754870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:48:28 +00:00
Kyunglyul Hyun
efad3660aa Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad am: 716f23d92f am: 5c2bad1c59 am: 0032133dab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603

Change-Id: I6560f3457b7bc9adb5e2147c64e0a8624be35468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:47:46 +00:00