Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
749,708 Commits 3 Branches 0 Tags
4eac44bc5681d4fb64d075d43c1b0447df088e7e
Commit Graph

749708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Minche Li
4eac44bc56 Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev 2022-03-02 01:09:36 +00:00
Jackal Guo
b4fd1c7a81 Merge "Mitigate the races during installation" into tm-dev 2022-03-02 01:01:56 +00:00
TreeHugger Robot
951aa29f72 Merge "Fix memory flags in external services and secondary zygotes." into tm-dev 2022-03-02 00:57:51 +00:00
Colin Cross
4c7fba2811 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I21f5874867e74ca12334711adf1fbc6938c1a3ff
 2022-03-02 00:55:39 +00:00
Binh Nguyen
cdda832572 Merge "Register AdServices to SystemServiceRegistry" into tm-dev 2022-03-02 00:54:42 +00:00
TreeHugger Robot
d8a8a405df Merge "adpf: Use one client token per process for all hint sessions" into tm-dev 2022-03-02 00:38:23 +00:00
Colin Cross
ffa0f38936 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I2eba7685c56d4931f63974b6bfcf13fbb2ab2345
 2022-03-02 00:34:33 +00:00
Colin Cross
e3086a9896 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: Iab0ad2e55f21ba464ae1b7d4c3ac3252638f711b
 2022-03-02 00:13:00 +00:00
Treehugger Robot
595d9645d5 [automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours 
am skip reason: Merged-In Id4c8b41b23adfe931b9953113f7175a11703dc10 with SHA-1 81a4684119 is already in history

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

Change-Id: I72780386c0b09c1dc5a892b829302d58100cab5f
 2022-03-02 00:11:47 +00:00
Colin Cross
a789b92644 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" 2022-03-02 00:01:05 +00:00
TreeHugger Robot
1f014a4a51 Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev 2022-03-01 23:50:49 +00:00
Atneya Nair
9350158d4e Merge "Update Soundpool callback interface" into tm-dev 2022-03-01 23:45:51 +00:00
Treehugger Robot
327c509933 Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004910

Change-Id: I442a38e34358715cee1033f1a955cc0a474f163e
 2022-03-01 23:41:33 +00:00
TreeHugger Robot
0a69364a40 Merge "Schedule binary measurement job at boot completed." into tm-dev 2022-03-01 23:26:31 +00:00
Joe Bolinger
532df4fc03 Merge changes from topic "coex-again-2" into tm-dev 
* changes:
  Temporarily disable some biometric prompt tests.
  Add Face and Fingerprint (Co-Ex) support to biometric prompt.
  Remove face to fingerprint multi-sensor behavior.
  Remove duplicated UDFPS view into single fingerprint view.
 2022-03-01 23:25:55 +00:00
Jing Ji
f464d627a2 Merge "Log bindService call and its service name in trace slices" into tm-dev 2022-03-01 23:24:47 +00:00
Treehugger Robot
53f21f4aae Merge "Reverted the ApnSetting behavior" am: 88b3357538 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004910

Change-Id: I8a47c3fff9df8fc7bd172e842fe1a38956bfb8e5
 2022-03-01 23:18:18 +00:00
TreeHugger Robot
837736b693 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 am: f40095f080 am: 7c11e55697 -s ours 
am skip reason: Merged-In Ibfa66624a4157b7c2c7d764e2b6bdb26ac5f1447 with SHA-1 8bfc531548 is already in history

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

Change-Id: Ib6ea10725d1fa020a615968a32d5ef735bd6ec39
 2022-03-01 23:17:46 +00:00
Treehugger Robot
88b3357538 Merge "Reverted the ApnSetting behavior" 2022-03-01 22:59:11 +00:00
TreeHugger Robot
f7b81da39f Merge "RemovalClient handles null authenticator" into tm-dev 2022-03-01 22:57:06 +00:00
TreeHugger Robot
7c11e55697 Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 am: f40095f080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16765537

Change-Id: If26eddbfb77bd7106d19c91bda6089716d724e91
 2022-03-01 22:54:59 +00:00
Jeremy Meyer
6f08ee22f9 Merge "Fix a ConcurrentModificationException when dumping resources" into tm-dev 2022-03-01 22:36:52 +00:00
Dave McCloskey
35a3b95937 Merge "Add an initial set of tests for Trust." into tm-dev 2022-03-01 22:34:38 +00:00
TreeHugger Robot
f40095f080 Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16765537

Change-Id: Ifd8cc68fb8b6536abf6def5e699374a08ec90ff0
 2022-03-01 22:32:18 +00:00
TreeHugger Robot
90afd87b4f [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: a05e799fac -s ours 
am skip reason: Merged-In Ibfa66624a4157b7c2c7d764e2b6bdb26ac5f1447 with SHA-1 d852b695e7 is already in history

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

Change-Id: I099aa41cbf99b56e3a9a51c8262de7e3dd359f9a
 2022-03-01 22:32:06 +00:00
TreeHugger Robot
4e51e85e00 Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16765537

Change-Id: Idb6c2c4d49d923fa981fa37712d2febef15593c6
 2022-03-01 22:10:47 +00:00
TreeHugger Robot
a05e799fac Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16765537

Change-Id: Iaa4f328bd4fa37f7399c588d1213471ba29f0954
 2022-03-01 22:10:01 +00:00
Josh Tsuji
e495e312ab Merge "Don't re-hide the keyguard if it isn't showing." into tm-dev 2022-03-01 22:05:53 +00:00
William Leshner
3a2940c819 Merge "Fix an IllegalStateException in dream overlays." into tm-dev 2022-03-01 21:59:44 +00:00
Jack Yu
ba84372d08 Reverted the ApnSetting behavior 
Returning null is already a behavior mentioned in the
public API document. Reverted the behavior back to be consistent
with Android 12.

Fix: 201089892
Test: atest CtsDevicePolicyManagerTestCases
Merged-In: Id4c8b41b23adfe931b9953113f7175a11703dc10
Change-Id: Id4c8b41b23adfe931b9953113f7175a11703dc10
 2022-03-01 13:52:05 -08:00
Binh Nguyen
e5753a77ad Register AdServices to SystemServiceRegistry 
Test: build
Bug: 210159588
Change-Id: If1e234b4e61292cc9d8ff62dbcdc042c495b70f0
 2022-03-01 13:51:55 -08:00
Sergey Serokurov
697c991ab6 Merge "Update stack position after a bubble is removed" into tm-dev 2022-03-01 21:44:47 +00:00
TreeHugger Robot
cc16c9178b Merge "Update permissions for ServiceState broadcast" into sc-dev 2022-03-01 21:41:50 +00:00
Nate Myren
d4e035d3c4 Merge "Default grant carrier apps POST_NOTIFICATIONS" into tm-dev 2022-03-01 21:13:08 +00:00
Treehugger Robot
452fdef120 Merge "Keystore: Support Curve 25519 in the SPI layer" am: 76cee808e2 am: 7b17653639 am: cb479e0827 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984970

Change-Id: Ib9fc34d05614192e4762b9e7934738e074728fca
 2022-03-01 21:07:01 +00:00
Shan Huang
9feb8c3ba2 Merge "Fix a race condition that causes BackAnimation to be null." into tm-dev 2022-03-01 21:02:13 +00:00
Treehugger Robot
cb479e0827 Merge "Keystore: Support Curve 25519 in the SPI layer" am: 76cee808e2 am: 7b17653639 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984970

Change-Id: I7434def089facb812a5d4fc59889ac402354df27
 2022-03-01 20:44:24 +00:00
Treehugger Robot
7b17653639 Merge "Keystore: Support Curve 25519 in the SPI layer" am: 76cee808e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984970

Change-Id: Ia2cf9182ba121878d7ea2bb9e30961637ac18518
 2022-03-01 19:41:58 +00:00
Treehugger Robot
76cee808e2 Merge "Keystore: Support Curve 25519 in the SPI layer" 2022-03-01 19:23:21 +00:00
Jeremy Meyer
b21e7cee30 Fix a ConcurrentModificationException when dumping resources 
Since the sResourcesHistory set is synchronized, an attemp to modify the
set will block while the forEach() method is running in the rare case
resources are being dumped. With a normal for loop, modifying the set
while in the loop results in a ConcurrentModificationException.

Fixes: 219609463
Test: Manual
Change-Id: I9b7bb965aa390e5dec696be07599f777c807c1e3
 2022-03-01 19:23:07 +00:00
TreeHugger Robot
7a53fdf6f7 [automerger skipped] Merge "[DO NOT MERGE] Keyguard was hiding occluding activities" into sc-v2-dev am: 1774ba8a97 am: b0aeecc0ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieed050045d37e4ededb8e31111490be03a4db9a2
 2022-03-01 19:18:50 +00:00
TreeHugger Robot
f0f7626b6e Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp am: 3649f735ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17043352

Change-Id: I29bb94f9f813f8b5d78539b90683cf2a96b55f10
 2022-03-01 19:18:06 +00:00
Presubmit Automerger Backend
dcb4292441 [automerger skipped] [automerge] [DO NOT MERGE] Keyguard was hiding occluding activities 2p: 267ecd151e am: 5ea8811701 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99243bfabae79f14470a595f7e5d372346ee3b80
 2022-03-01 19:17:36 +00:00
TreeHugger Robot
b0aeecc0ae Merge "[DO NOT MERGE] Keyguard was hiding occluding activities" into sc-v2-dev am: 1774ba8a97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17043352

Change-Id: I31d8bab3fb73d310c1ffd50c3877bdebee9ae142
 2022-03-01 19:17:29 +00:00
TreeHugger Robot
1c11a5dfe6 Merge "Support ANRs from windows that are not tracked by WM" into tm-dev 2022-03-01 19:08:41 +00:00
Will
22e4422cd2 Fix an IllegalStateException in dream overlays. 
Test: atest DreamOverlayServiceTest
Bug: 219908617
Change-Id: Id4eb877def0d1633cdc544881ea254d0b00263ae
 2022-03-01 11:01:13 -08:00
Vishnu Nair
8dfd38ad76 Revert "SurfaceView: Synchronize all surface view changes with V..." 
Revert "SurfaceView:  Avoid destination frame updates on multipl..."

Revert submission 16944940-sv-changes-tm-dev

Reason for revert: b/221631942
Reverted Changes:
I0d214e3f7:SurfaceView:  Avoid destination frame updates on m...
I0b5741b37:SurfaceView: Synchronize all surface view changes ...
I5226c304b:SurfaceView: Avoid destination frame updates on mu...

Change-Id: I35b7c1be7202ebe89a5309284a9401c8084e9d79
 2022-03-01 18:55:13 +00:00
Joe Bolinger
2effe9b44a Temporarily disable some biometric prompt tests. 
The removal cl (https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/16980367/3) introduced an issue with the tests that causes an indirect failure for the systemui pre-submit tests, which does not repo locally. This should be reverted as soon as possible and is only temporarily ignored to enable dogfood builds.

Bug: 222119218
Test: presubmit

Change-Id: I41d64ffc528bccc98a2e5da7a98edf472539f3de
 2022-03-01 18:54:30 +00:00
TreeHugger Robot
1774ba8a97 Merge "[DO NOT MERGE] Keyguard was hiding occluding activities" into sc-v2-dev 2022-03-01 18:48:39 +00:00
TreeHugger Robot
3649f735ef Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE] Keyguard was hiding occluding activities 2p: 267ecd151e
  [DO NOT MERGE] Keyguard was hiding occluding activities
 2022-03-01 18:48:39 +00:00