drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,502 Commits 1 Branch 0 Tags
Commit Graph

653502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Jiang
f46dc85e5a Merge "Remove modules-utils-build_system from filegroup" am: a4d60ac1ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1792931

Change-Id: If693bdf1ee36e6997373bb70fd390b32d7329a7e
 2021-08-12 02:11:28 +00:00
Nate Jiang
a4d60ac1ee Merge "Remove modules-utils-build_system from filegroup" 2021-08-12 01:56:33 +00:00
Suren Baghdasaryan
5c822bf4ea [automerger skipped] Merge "Adding native flag namespace for lmkd." am: 1fdacf6376 am: eb10acc1cb -s ours 
am skip reason: Merged-In I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 with SHA-1 93c48c704a is already in history

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

Change-Id: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
 2021-08-11 23:28:31 +00:00
Suren Baghdasaryan
eb10acc1cb Merge "Adding native flag namespace for lmkd." am: 1fdacf6376 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786787

Change-Id: I8d661ad5868a7df5df08e67574bcd1eda9092772
 2021-08-11 23:13:07 +00:00
Suren Baghdasaryan
1fdacf6376 Merge "Adding native flag namespace for lmkd." 2021-08-11 22:56:11 +00:00
Rob Carr
ba8979c6d7 Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521640

Change-Id: Iedcc5f3ca75f9ffd022c14076ed05c06c874d3b4
 2021-08-11 22:11:18 +00:00
Rob Carr
ccdb324274 Merge "Update wallpaper offset when changing target from null" into sc-dev 2021-08-11 21:58:32 +00:00
Makoto Onuki
a33d48c48e Merge "Clarify how FGS restriction won't apply STICKY FGS restarts" into sc-dev am: 0c1dc2fc76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15484572

Change-Id: Ic11bfc07ac3ad19222bcc48dc7e54f46a1af6fe6
 2021-08-11 21:35:25 +00:00
Makoto Onuki
0c1dc2fc76 Merge "Clarify how FGS restriction won't apply STICKY FGS restarts" into sc-dev 2021-08-11 21:17:20 +00:00
Suren Baghdasaryan
9a740a18df Adding native flag namespace for lmkd. 
For experiment flag testing, adding lmkd flag in DeviceConfig.

Bug: 194316048
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I1f13d6bbb4a9a7fd8825d7e5acde416750271df4
Merged-In: I1f13d6bbb4a9a7fd8825d7e5acde416750271df4
 2021-08-11 17:41:41 +00:00
Automerger Merge Worker
578d06c984 Merge "Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 am: 726c374fa3" into sc-dev-plus-aosp 2021-08-11 17:39:27 +00:00
Suren Baghdasaryan
6e6a94d00b Merge "Adding native flag namespace for lmkd." into sc-dev-plus-aosp 2021-08-11 17:39:23 +00:00
Steven Moreland
df10c51e95 Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 am: 726c374fa3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793027

Change-Id: I79e5443b356906fcb0787f8c286af7bb520326a1
 2021-08-11 17:39:13 +00:00
John Wu
266d79d0c1 Merge "Update DynamicSystemInstallationService manifest" am: 703378f39c am: 2f6ec8e09e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793447

Change-Id: Ia3b0795a883fe21e030d82dcdac2c6a5d88fc725
 2021-08-11 17:38:31 +00:00
Steven Moreland
726c374fa3 Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793027

Change-Id: I18fff5e8d3e5c7e308b218ab95450f9a10593d38
 2021-08-11 17:23:15 +00:00
John Wu
2f6ec8e09e Merge "Update DynamicSystemInstallationService manifest" am: 703378f39c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793447

Change-Id: Ia2ee451b72eab5c826d7362a6e60954cb68b93f3
 2021-08-11 17:22:57 +00:00
Steven Moreland
b801a513d1 Merge "ServiceManager: waitForService uses allowBlocking" 2021-08-11 17:16:42 +00:00
Steven Moreland
d247e417a2 ServiceManager: waitForService uses allowBlocking 
For parity with getService and checkService.

Bug: 194806512
Test: boot
Change-Id: Iecc3f1c6d6ae9bee94252281b416d62f3bf30afd
 2021-08-11 17:16:32 +00:00
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