653597 Commits

Author SHA1 Message Date
John Wu
703378f39c Merge "Update DynamicSystemInstallationService manifest" 2021-08-11 17:07:06 +00:00
John Wu
2508f7b926 Update DynamicSystemInstallationService manifest
Add additional data specifications in VerificationActivity's
<intent-filter>.

Bug: 195988279
Test: atest CtsOsTestCases:DynamicSystemClientTest
Change-Id: Iabe53ed421ce23f0f7062e9b9d92c29c47cc98ab
2021-08-11 10:06:38 +00:00
TreeHugger Robot
e0f027aff9 Merge "Attempt to clear memory after keyguard PIN entry" into sc-dev am: f16b3f76aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15502355

Change-Id: Ifb83ec99d39758746f92d8f2a597df088c67e122
2021-08-11 09:43:14 +00:00
TreeHugger Robot
f16b3f76aa Merge "Attempt to clear memory after keyguard PIN entry" into sc-dev 2021-08-11 09:32:35 +00:00
Nate Jiang
452bfe1ae9 Remove modules-utils-build_system from filegroup
Remove modules-utils-build_system from static lib of service-wifi.jar,
becasue it is already in static lib of framework-wifi.jar

Bug: 195965491
Test: build module
Change-Id: Ica496e67dd8b7c83aa93a512d06ad1a05d1c9c8d
2021-08-11 00:11:49 -07:00
Rhed Jao
eeca8de734 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours am: 37739a5f52 -s ours am: 1975cbc919 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ef9adaede04282b7876468a322ff0a22cc0c2bc
2021-08-11 06:02:26 +00:00
Rhed Jao
8d50470345 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours am: 586644a9d8 -s ours am: 9c16d399d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d622b699c772e4731a599d921ff2e706197a379
2021-08-11 06:02:05 +00:00
Rhed Jao
1975cbc919 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours am: 37739a5f52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b3d46426a94de80ee45bd72dd8d008b253b81cf
2021-08-11 05:58:33 +00:00
Rhed Jao
9c16d399d8 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours am: 586644a9d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4da740c2b74e35aeffe5f9f2b2f4355f194a18d
2021-08-11 05:46:41 +00:00
Rhed Jao
37739a5f52 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 6172201637 is already in history

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

Change-Id: I98f42b34dafbb4a16ebb265b7dc18b275390b94e
2021-08-11 05:33:39 +00:00
Rhed Jao
586644a9d8 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 6172201637 is already in history

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

Change-Id: Ic2a231c592b42a39b5e24da497c57d92394aec6d
2021-08-11 05:33:38 +00:00
Treehugger Robot
3360c396f6 [automerger skipped] Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" am: cf2ef57519 am: 52b8c0f007 -s ours
am skip reason: Merged-In I3c1d2da1d28a494d8b393c4502521b3f0699adf6 with SHA-1 1d3b83664a is already in history

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

Change-Id: Iec34448dbb48c7b7fb10ad7fce1dd4b324020f71
2021-08-11 05:23:18 +00:00
Rhed Jao
1c93d67774 Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev 2021-08-11 05:19:39 +00:00
Treehugger Robot
52b8c0f007 Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" am: cf2ef57519
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1792153

Change-Id: I400cd575b38061d02cf6def535474ce1cfa6937c
2021-08-11 05:04:31 +00:00
Treehugger Robot
cf2ef57519 Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" 2021-08-11 04:44:53 +00:00
Rhed Jao
84376721f9 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours am: 707762ee17 -s ours am: d106257f8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e737e38ea54b7a70a9e88a76d7678048db680b9
2021-08-11 04:37:10 +00:00
Sudheer Shanka
217c9361b6 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours am: 3c2542f54b -s ours am: 9ccde3abfc -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: Ib657cc9384228a4ecb7efd94a2a910c557f44fc3
2021-08-11 04:36:59 +00:00
Sudheer Shanka
857f13d441 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours am: dd48647b28 -s ours am: a8a56b5fc2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I206e357043dd7cb7821f7d216a110708c67d911c
2021-08-11 04:36:40 +00:00
Rhed Jao
033de33647 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours am: 5acec9a273 -s ours am: f12fc4d57e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd675d4a576cd0e116ffb89448dc3222dc86dbb3
2021-08-11 04:36:20 +00:00
Sudheer Shanka
7cfcd69c8e [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours am: aacfaa96a1 -s ours am: 7d954eebf2 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I6ed863f5933a330b1a05574b81d138ac2e6ed57c
2021-08-11 04:36:06 +00:00
Sudheer Shanka
8d87765460 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours am: f2b8a4e240 -s ours am: a3ddc3186d -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I31314d080fb8cd0688e1d8ea40db96df4e55f9df
2021-08-11 04:35:29 +00:00
Rhed Jao
d106257f8a [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours am: 707762ee17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6405d77f35fde092126e4cc51e0e578069cc3c3
2021-08-11 04:33:35 +00:00
Sudheer Shanka
9ccde3abfc [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours am: 3c2542f54b -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I94a84ce668e34e0d725f60bc33bb4516af6417ef
2021-08-11 04:33:04 +00:00
Sudheer Shanka
a8a56b5fc2 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours am: dd48647b28 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: Iedd61291e766c4fa75ee2004a568a1c4944d1de6
2021-08-11 04:32:41 +00:00
Rhed Jao
f12fc4d57e [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours am: 5acec9a273 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63c4c9facf39c36ea075d4eada9f94f2058cf904
2021-08-11 04:22:17 +00:00
Sudheer Shanka
7d954eebf2 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours am: aacfaa96a1 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I1f66e2d64e41b2deea5a60f311aff62b3603e832
2021-08-11 04:22:01 +00:00
Sudheer Shanka
a3ddc3186d [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours am: f2b8a4e240 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I887a46d9c72c5624377c525a0d861c26caaee5b8
2021-08-11 04:21:31 +00:00
Rhed Jao
5acec9a273 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If413f1e2c200f2555afe3569583e6068e90788ce
2021-08-11 04:07:12 +00:00
Rhed Jao
707762ee17 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74d695ade3a5a8247b69be5364e03d1c87d46850
2021-08-11 04:07:10 +00:00
Sudheer Shanka
3c2542f54b [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: Ic9c76a8694a8c23696a69afbc3f742cfcd64ffb7
2021-08-11 04:06:59 +00:00
Sudheer Shanka
aacfaa96a1 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I5122bda79c3816929051decb0cd67fc5326f6597
2021-08-11 04:06:58 +00:00
Sudheer Shanka
dd48647b28 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: Ia55503967cc88ab55f048a8159c7df259b18605c
2021-08-11 04:06:52 +00:00
Sudheer Shanka
f2b8a4e240 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: Ic23e931a2164680d05d288fbfafef6c0056f8007
2021-08-11 04:06:32 +00:00
Rhed Jao
4fc54276f8 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e421d9487a7bfec701717cf34d05dbdf294bb04
2021-08-11 04:06:06 +00:00
Riddle Hsu
d4daf94b77 Merge "Allow to use fixed rotation if recents is animating" into sc-dev am: 58c7e9499c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15501963

Change-Id: If8fc20f15ba0575fd62b7f385ae138a61ebf0ce7
2021-08-11 03:55:20 +00:00
Riddle Hsu
58c7e9499c Merge "Allow to use fixed rotation if recents is animating" into sc-dev 2021-08-11 03:51:48 +00:00
Rhed Jao
a746ce4a30 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 b55d314f46 is already in history

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

Change-Id: Idb9fa3da460f60289aa7269c509d49ad22ccd60e
2021-08-11 03:51:10 +00:00
Sudheer Shanka
3d51cdb7cd [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours am: 0e04f5ea34 -s ours am: 88612b95d4 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: Ic731444541a5ec06ccc4e37241d742ac27b9ab81
2021-08-11 03:51:05 +00:00
Sudheer Shanka
88612b95d4 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours am: 0e04f5ea34 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: I99be021d0bc0d8ba59485146a4d6b9e9c6843bec
2021-08-11 03:47:49 +00:00
Sudheer Shanka
9769bbeeca [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I6b2830a0ff743222bf350c619dc7f2e57c92f279
2021-08-11 03:46:50 +00:00
Sudheer Shanka
7b68389397 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I7da86dee11bfad7617935e6ffd7a72eb310123a7
2021-08-11 03:46:34 +00:00
Sudheer Shanka
3aae24d65b [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours am: ec27887633 -s ours am: c1b3a16c94 -s ours am: c8c0c4be06 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I04082ab91d24209da1d1445fcbbe41aecb1d96cf
2021-08-11 03:46:28 +00:00
Sudheer Shanka
c8c0c4be06 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours am: ec27887633 -s ours am: c1b3a16c94 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I4551fdaa331f5ea58974cc6243544ed5841b41e0
2021-08-11 03:40:44 +00:00
Rhed Jao
eeb7b8088a Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev 2021-08-11 03:39:57 +00:00
Sudheer Shanka
ff3e17954d [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours am: 88bcfad227 -s ours am: fd6761f570 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: Ic2d2f1b7f16b6aefb6fefc0030ad7d21f13e2dc4
2021-08-11 03:37:03 +00:00
Sudheer Shanka
4ed2d6d4c6 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours am: ec27887633 -s ours am: 95e116139c -s ours am: 2269a2f9ff -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I7ebb1c2b460e4b7efe298dd661db5a6fcfa8231f
2021-08-11 03:36:45 +00:00
Sudheer Shanka
1620886174 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours am: 77547e1deb -s ours am: 2a20338efa -s ours am: fc076e511f -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: I4233781e345520f8fdb757ad264321d96f42d53c
2021-08-11 03:36:25 +00:00
Sudheer Shanka
5e07c01164 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours am: 77547e1deb -s ours am: f305cf08ee -s ours am: 616fcb2147 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: Ibd5920e8851b0cd5979a6d542814ce3e312e4387
2021-08-11 03:36:14 +00:00
Sudheer Shanka
3abd3790e0 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06 am: 29c9f61d92 -s ours am: 9796240f45 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: I094bee2e053ae64f687ee80826c57ce20212c903
2021-08-11 03:35:32 +00:00
Sudheer Shanka
fd6761f570 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours am: 88bcfad227 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: I358918573013f6ee874bf99a85f3cc3432ef7702
2021-08-11 03:28:15 +00:00