Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
751,600 Commits 3 Branches 0 Tags
58d12f7101d1bf58cd95157fd429490c9d63bb0b
Commit Graph

751600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jing Ji
58d12f7101 Merge "Log bindService call and its service name in trace slices" into tm-dev am: f464d627a2 am: a989e145d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039165

Change-Id: Ibc99978b2654765b6616ede9ada148192937c406
 2022-03-02 00:02:22 +00:00
TreeHugger Robot
bbba2dd759 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 am: f40095f080 am: 7c11e55697 -s ours am: 837736b693 -s ours am: fc41d3dc24 -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: Iefcd06c6f7a3360ff5c4b5130d8036799218dd11
 2022-03-02 00:01:23 +00:00
TreeHugger Robot
97eae7e16c Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev am: 1f014a4a51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17048246

Change-Id: I1a66c41dd432f1077bf397c347566ed9d4ce43d7
 2022-03-01 23:52:51 +00:00
Atneya Nair
5f153df393 Merge "Update Soundpool callback interface" into tm-dev am: 9350158d4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039306

Change-Id: Ia44441886fe077ea71d8293f360e2c6244605bd7
 2022-03-01 23:52: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
a0b2236e2c Merge "Schedule binary measurement job at boot completed." into tm-dev am: 0a69364a40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046623

Change-Id: If23837e41a3de1976f6ab0e71abd87ba2b3da224
 2022-03-01 23:42:25 +00:00
Joe Bolinger
61cd3a1294 Merge changes from topic "coex-again-2" into tm-dev am: 532df4fc03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17040854

Change-Id: I312b3ae24f36969ac6d22a3e507b92ebb6a46524
 2022-03-01 23:41:52 +00:00
Jing Ji
a989e145d9 Merge "Log bindService call and its service name in trace slices" into tm-dev am: f464d627a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039165

Change-Id: Ic14d593a1a8210a9c03732a47f4217dffd5fe146
 2022-03-01 23:41:00 +00:00
Jing Ji
f7331c89aa Merge "Log bindService call and its service name in trace slices" into tm-dev am: f464d627a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039165

Change-Id: I7af2606ffd7545ca89b0ec8f31c9742bbb6eeb6a
 2022-03-01 23:40:57 +00:00
TreeHugger Robot
fc41d3dc24 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 am: f40095f080 am: 7c11e55697 -s ours am: 837736b693 -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: I573b19e3cc273ade129b4ec5b4a0d5cde0bb2af2
 2022-03-01 23:40:25 +00:00
TreeHugger Robot
7d48c243c9 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 am: f40095f080 am: 7c11e55697 -s ours am: 837736b693 -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: Ib51972976dc05ac8f578126ce42d5f42e9d682a5
 2022-03-01 23:40:16 +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
93993773d5 Merge "RemovalClient handles null authenticator" into tm-dev am: f7b81da39f am: b08c64327d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033636

Change-Id: I6fbbe7e77bd6885074a444fd29535aa8ebc9fa81
 2022-03-01 23:21:11 +00:00
Jeremy Meyer
930e25608e Merge "Fix a ConcurrentModificationException when dumping resources" into tm-dev am: 6f08ee22f9 am: 208a7d3154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037017

Change-Id: I6dc19bea2b60de4eeb725d6d45975df005bf83d5
 2022-03-01 23:20:33 +00:00
Dave McCloskey
0a386b2fa2 Merge "Add an initial set of tests for Trust." into tm-dev am: 35a3b95937 am: e857d16dc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17009744

Change-Id: I60e4330071f273a35e186c6ead941e0f26dd28b4
 2022-03-01 23:19:50 +00:00
TreeHugger Robot
c60997fa58 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: a05e799fac -s ours am: 90afd87b4f -s ours am: ae87cc1914 -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: I4d52046cef8b629b139c5d03bc50fdbfe706edf0
 2022-03-01 23:18:30 +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
e9a906bc2f Merge "RemovalClient handles null authenticator" into tm-dev am: f7b81da39f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033636

Change-Id: I791d63db4dc28c8c7dad574c197f3e41d1186a35
 2022-03-01 22:58:21 +00:00
TreeHugger Robot
b08c64327d Merge "RemovalClient handles null authenticator" into tm-dev am: f7b81da39f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033636

Change-Id: Ife45b9744a3f6e42a1dd50d0b571dd35710f4d66
 2022-03-01 22:58:05 +00:00
Jeremy Meyer
208a7d3154 Merge "Fix a ConcurrentModificationException when dumping resources" into tm-dev am: 6f08ee22f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037017

Change-Id: I75db7faa499c103a70836e75f1e14fe8c1b061e3
 2022-03-01 22:57:51 +00:00
Dave McCloskey
e857d16dc0 Merge "Add an initial set of tests for Trust." into tm-dev am: 35a3b95937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17009744

Change-Id: I8bd4d6914ba773fa2014dd0b4502cc225df5f22d
 2022-03-01 22:57:35 +00:00
Jeremy Meyer
3b1c45b8c5 Merge "Fix a ConcurrentModificationException when dumping resources" into tm-dev am: 6f08ee22f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037017

Change-Id: I6b10c774885c6cd497856f72ad3f8774a9e9d2b0
 2022-03-01 22:57:18 +00:00
TreeHugger Robot
f7b81da39f Merge "RemovalClient handles null authenticator" into tm-dev 2022-03-01 22:57:06 +00:00
TreeHugger Robot
ae87cc1914 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: a05e799fac -s ours am: 90afd87b4f -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: I1765597beaacd2c05012748f2bb48568e8ebc315
 2022-03-01 22:56:52 +00:00
Dave McCloskey
2b050a507a Merge "Add an initial set of tests for Trust." into tm-dev am: 35a3b95937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17009744

Change-Id: Ibcff34aaeb010b9bf1e39ba8c536720b8b9abf23
 2022-03-01 22:56:42 +00:00
TreeHugger Robot
f13a2a8f9a [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: a05e799fac -s ours am: 90afd87b4f -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: I11c2e4ee1979c201fbd5a919bff69138818647e2
 2022-03-01 22:55:08 +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
Yinglei Wang
cf738b345e Merge "Make a11y InputMethod constructor public" 2022-03-01 22:30:28 +00:00
Josh Tsuji
20e5ab3360 Merge "Don't re-hide the keyguard if it isn't showing." into tm-dev am: e495e312ab am: 6c034d8ef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003628

Change-Id: I8366197043479b3bf3a20f02fdb5bff782db23f2
 2022-03-01 22:25:57 +00:00
William Leshner
0b6088c137 Merge "Fix an IllegalStateException in dream overlays." into tm-dev am: 3a2940c819 am: 4ab32e84aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037278

Change-Id: I318e49156426030892509c9acbe4008980e630fc
 2022-03-01 22:25:13 +00:00
Sergey Serokurov
8b30fbd3b3 Merge "Update stack position after a bubble is removed" into tm-dev am: 697c991ab6 am: 031d4a36c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16994045

Change-Id: I0b67e7210c11487c9cbbcdc60dd49135eb246153
 2022-03-01 22:24:31 +00:00
Nate Myren
c4d240f138 Merge "Default grant carrier apps POST_NOTIFICATIONS" into tm-dev am: d4e035d3c4 am: 6b3240d098 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17015643

Change-Id: I4b692dc7ad802235018f9d2e7c6c27a7b7c390c3
 2022-03-01 22:23:21 +00:00
Treehugger Robot
c6d2dc738a Merge "Keystore: Support Curve 25519 in the SPI layer" am: 76cee808e2 am: 7b17653639 am: cb479e0827 am: 452fdef120 am: 53f19327c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984970

Change-Id: I4f45db4d755117236198d072f81cd5c14890e8fb
 2022-03-01 22:22:42 +00:00
Shan Huang
271bf5e719 Merge "Fix a race condition that causes BackAnimation to be null." into tm-dev am: 9feb8c3ba2 am: f5ad5d60ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047561

Change-Id: I89d32bf46878ace207403540f0392bb572304c5b
 2022-03-01 22:21:35 +00:00
Josh Tsuji
6c034d8ef4 Merge "Don't re-hide the keyguard if it isn't showing." into tm-dev am: e495e312ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003628

Change-Id: I6967b2591ef724b7a673584034504789bd6efda1
 2022-03-01 22:21:10 +00:00
Josh Tsuji
85597646bf Merge "Don't re-hide the keyguard if it isn't showing." into tm-dev am: e495e312ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003628

Change-Id: I60de978a1ad03cb0e7ddb9f5e177c75a47814f64
 2022-03-01 22:20:40 +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
Automerger Merge Worker
3b4f9c756d Merge "Merge "Fix an IllegalStateException in dream overlays." into tm-dev am: 3a2940c819" 2022-03-01 22:03:54 +00:00
TreeHugger Robot
83909155fd Merge "New Pipeline: log sections in NodeSpecBuilder" 2022-03-01 22:03:41 +00:00
William Leshner
f7c7ecefd4 Merge "Fix an IllegalStateException in dream overlays." into tm-dev am: 3a2940c819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037278

Change-Id: I739f6b00b11853fd6ff37fc46ef8724dde0b2d97
 2022-03-01 22:03:23 +00:00
Sergey Serokurov
b504ff1511 Merge "Update stack position after a bubble is removed" into tm-dev am: 697c991ab6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16994045

Change-Id: Ie413b8b382fdac1cd932b9b5672605f929606e29
 2022-03-01 22:02:32 +00:00