Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,654 Commits 3 Branches 0 Tags
bdf429792124516ae6872f40843b9ebc011c59ae
Commit Graph

651654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Brzeziński
bdf4297921 Merge "Showing action buttons in collapsed QS in split shade" into sc-v2-dev 2021-08-11 17:59:24 +00:00
Evan Rosky
b5da127d38 Merge "Treat GONE windows as READY for sync" into sc-v2-dev 2021-08-11 17:17:52 +00:00
Winson Chung
2e990c1f26 Merge "Extract remote insets controller out of DisplayImeController" into sc-v2-dev 2021-08-11 17:17:33 +00:00
TreeHugger Robot
ca15bb8468 Merge "Update SurfaceControl buffer size when increasing pointer size" into sc-v2-dev 2021-08-11 16:05:30 +00:00
Alex Florescu
f1edea6716 Merge "Read isKeyguardScreenRotationAllowed each time instead of caching" into sc-v2-dev 2021-08-11 15:31:08 +00:00
TreeHugger Robot
2f48e69754 Merge "Test should handle both device orientations" into sc-v2-dev 2021-08-11 15:15:42 +00:00
Alex Florescu
bc2f0869e0 Test should handle both device orientations 
Fixes: 196022981
Test: atest SystemUITests:AccessibilityFloatingMenuViewTest
Change-Id: I23e115e9dade4c4d4f72c2c506c4b90698f1eadf
 2021-08-11 14:30:26 +01:00
Alex Florescu
656341229a Read isKeyguardScreenRotationAllowed each time instead of caching 
When devices change device state, the value of this can change and it
should be read again.

Fixes: 193390733
Test: manual
Change-Id: Ia9725efe5be4a9a366cc07d89c656b90a6348262
 2021-08-11 11:01:30 +00:00
Alex Chau
5214873aa8 Merge "Revert "No NavigationBar layer in tablets"" into sc-v2-dev 2021-08-11 10:15:22 +00:00
TreeHugger Robot
44ed3ed920 Merge "Attempt to clear memory after keyguard PIN entry" into sc-dev am: f16b3f76aa am: abd75290ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15502355

Change-Id: I6e7a7827f85f5a7cb329b7cc62bba8803d0d2a7c
 2021-08-11 09:59:12 +00:00
TreeHugger Robot
abd75290ad 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: Idf13cbd578dddf67bdcb07d5beff349f9dba09a4
 2021-08-11 09:44:05 +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
Alex Chau
a7a5ad7b78 Revert "No NavigationBar layer in tablets" 
This reverts commit fb999dc720.

Reason for revert: breaking TaplTestsLauncher3.testDevicePressMenu and testPressHomeOnAllAppsContextMenu for all foldable targetse

Bug: 191660313
Change-Id: I04c9e28c92ed0cf9e822ecf4409edfc8f37c36c4
 2021-08-11 08:33:13 +00:00
Rhed Jao
45d0421af3 [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: ecd6190673 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If95c88d7f55b28145f466a3abba38532cdcb6eb3
 2021-08-11 06:15:14 +00:00
Rhed Jao
78e552ab09 [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: 154813b36e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cc7f45db5cb88baa074f323a32f213939b2ad37
 2021-08-11 06:15:04 +00:00
Rhed Jao
ecd6190673 [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: I26eaf919dedef73a274a48ee46395915c1a0c06d
 2021-08-11 06:03:08 +00:00
Rhed Jao
154813b36e [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: Iccf66cb13c5ad11fb8f0d4a3e6a380fb0e29b8e3
 2021-08-11 06:03:01 +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
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
Rhed Jao
77a99d2abd [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: 2ba3f208d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6b262db7f1443a6ea55c05a2fc35b79ecb2940a
 2021-08-11 04:47:11 +00:00
Sudheer Shanka
bde023d19b [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: eaad345187 -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: I56a682deeb0a4044cfd53563711b6dc9ac566df6
 2021-08-11 04:47:02 +00:00
Sudheer Shanka
cf919a8e12 [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: 2792b24688 -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: I200353c9f5e27ff142a82a97ff8c72948542bf1d
 2021-08-11 04:46:54 +00:00
Rhed Jao
8bb0b183cc [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: 6d3281776b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I031296ba3fa11094c8d552e1dcdfe82edd6121c0
 2021-08-11 04:46:40 +00:00
Sudheer Shanka
b19fd4dfd8 [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: 6c03ea592c -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: Id7e2e601c845557878248c02c7918e8ed603813d
 2021-08-11 04:46:20 +00:00
Sudheer Shanka
b6ada92e47 [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: e0fdc29bbe -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: I11ae35798617730fa546c6126f722026456b7912
 2021-08-11 04:45:58 +00:00
Rhed Jao
2ba3f208d0 [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: I01313da6465b9aa451dc0f1036a67ecb66f77d11
 2021-08-11 04:37:04 +00:00
Sudheer Shanka
eaad345187 [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: Ic92471789416c220b38d86834b41b296ce569292
 2021-08-11 04:36:57 +00:00
Sudheer Shanka
2792b24688 [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: I07d9f66a050de09161723a2ac19bfb3121c8561e
 2021-08-11 04:36:46 +00:00
Rhed Jao
6d3281776b [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: Ic70b58fc23bba4527fef6781f8d50d3d0bba37a2
 2021-08-11 04:36:41 +00:00
Sudheer Shanka
6c03ea592c [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: I23ace7822d159c88c852498c6af571c85457f401
 2021-08-11 04:36:35 +00:00
Sudheer Shanka
e0fdc29bbe [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: I7c9271948a91e9810ee5ff3971af7fadafacb533
 2021-08-11 04:36:23 +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
8ddf7624d1 Merge "Allow to use fixed rotation if recents is animating" into sc-dev am: 58c7e9499c am: 11d2126532 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15501963

Change-Id: I8365111b7fa9699a00011379260fb91632aaca21
 2021-08-11 03:53:42 +00:00
Sudheer Shanka
4cf785d9da [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: 747d072400 -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: I96ddb6d81df5706f42df6cc7c8e6564cb29cf1a5
 2021-08-11 03:53:33 +00:00
Sudheer Shanka
7e888c6322 [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: 99f4a6ef84 -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: Ia393103c748d119a2317af6f524746fb608a3d40
 2021-08-11 03:53:14 +00:00