Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
630,809 Commits 3 Branches 0 Tags
dcdb236a6ca70fb335a8871891f3b0478002e87f
Commit Graph

630809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Stout
dcdb236a6c Merge "Only create DPCs for LocalDisplays & FLAG_OWN_DISPLAY_GROUP" into sc-dev 2021-03-20 00:48:53 +00:00
TreeHugger Robot
864c714d77 Merge "Lazy load the allocation of Slog message formatting objects." into sc-dev 2021-03-20 00:29:12 +00:00
Tyler Gunn
5bb6b8ad57 Merge "Propagate call quality reports from Telephony to CallDiagnosticService." into sc-dev 2021-03-20 00:23:33 +00:00
TreeHugger Robot
9f15b8d17a Merge "Updates to API based on API council feedback." into sc-dev 2021-03-20 00:02:52 +00:00
Bob Badour
de3fb7e9b3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-03-19 23:55:24 +00:00
TreeHugger Robot
0b6d627ebe Merge "Update DOMAIN_VERIFICATION_AGENT to internal|privileged" into sc-dev 2021-03-19 23:45:22 +00:00
Nikita Dubrovsky
1b2051e372 Merge "Integrate OnReceiveContentListener in View.onDragEvent" into sc-dev 2021-03-19 23:43:26 +00:00
Matt Casey
6e67c50402 Merge "Layout and style updates for LongScreenshotActivity" into sc-dev 2021-03-19 23:36:09 +00:00
Galia Peycheva
c3f3255c38 Merge "Add shell control for disabling blur" into sc-dev 2021-03-19 23:13:38 +00:00
Treehugger Robot
5fb05e5201 Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407 am: 1a71a8825b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: Ia809b070bc1eda0fdbf4701f626fa5bbb11b42e8
 2021-03-19 22:51:26 +00:00
Martin Brabham
e1985289e8 [automerger skipped] Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3 am: b4f9ff1810 am: a4d053d2e1 -s ours 
am skip reason: skip tag Change-Id I46aec8c2cb64a8da8957d01d32b879d60df7a31c with SHA-1 6ab241ca6a is already in history

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

Change-Id: Ib8280af19016fa6afe23bde713fb1c51e9e1b02d
 2021-03-19 22:51:00 +00:00
Christian Wailes
cbc2ac29ee Merge "Update OWNERS file" am: d6c3dfb3ff am: 4f5e3b92f7 am: f1eb6c7bf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: I011e62c84151f46fbf4223cd52d11f2edb3d6c30
 2021-03-19 22:50:29 +00:00
Lucas Dupin
ed182a33e1 Merge "UX feedback for ripple" into sc-dev 2021-03-19 22:49:50 +00:00
Ryan Mitchell
094d0adb13 Merge "OMS: Update PM on main thread with lock" into sc-dev 2021-03-19 22:46:18 +00:00
Dmitri Plotnikov
31c3622909 Merge "Fix and re-enable BstatsCpuTimesValidationTest" into sc-dev 2021-03-19 22:40:02 +00:00
Curtis Belmonte
a5a930725f Merge "Add placeholder sensor ID to biometric event logs" into sc-dev 2021-03-19 22:21:30 +00:00
Treehugger Robot
1a71a8825b Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: Iab03a5437fd38009ef272865d065a37cd98c3c6a
 2021-03-19 22:10:37 +00:00
Martin Brabham
a4d053d2e1 Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3 am: b4f9ff1810 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556758

Change-Id: If218e0c4193dfb4e1c282ce1abfc8faa882dcba8
 2021-03-19 22:10:33 +00:00
Christian Wailes
f1eb6c7bf4 Merge "Update OWNERS file" am: d6c3dfb3ff am: 4f5e3b92f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: I7b35ae63b0dc993d5fbd7afccb25a87488999401
 2021-03-19 22:09:01 +00:00
TreeHugger Robot
54580409da Merge "Fix ContextHubManager docs" into sc-dev 2021-03-19 22:08:13 +00:00
TreeHugger Robot
3d345db0a4 Merge "Add nullability annotations and imports" into sc-dev 2021-03-19 22:00:53 +00:00
TreeHugger Robot
30d9c2d2de Merge "Add light reveal for auth from aod" into sc-dev 2021-03-19 21:50:55 +00:00
Sean Stout
3449e29e47 Only create DPCs for LocalDisplays & FLAG_OWN_DISPLAY_GROUP 
Instead of all Displays having their own DisplayPowerController, this CL
makes it so that only LocalDisplays or displays which have explicitly
requested a DisplayGroup will have a DPC created.

This preserves existing behavior for non-physical displays.

Bug: 181901142
Test: launch Android Auto in DHU mode and turn off main display
Change-Id: I9aa333f8dce05b5dcebf11d16fd8b0f61c3377cd
 2021-03-19 14:47:08 -07:00
Treehugger Robot
9f8fd40407 Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: I1881ca6a693ec27e78e3f781d87858f27858efbc
 2021-03-19 21:44:45 +00:00
Martin Brabham
b4f9ff1810 Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556758

Change-Id: I25e393b48f0598834196c970be4d29f20216af97
 2021-03-19 21:37:27 +00:00
Christian Wailes
4f5e3b92f7 Merge "Update OWNERS file" am: d6c3dfb3ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: Ibfb0fa8b55f2a5bdb7d732287d246729bdd3b576
 2021-03-19 21:32:14 +00:00
Jeff Sharkey
e0f6165387 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47 am: cc506c3882 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Idf7c352b2e90ef93d833ecb8896444c5228e53e7
 2021-03-19 21:17:00 +00:00
TreeHugger Robot
72f1c8bca4 Merge "Add support for stretch overscroll to internal ViewPager" into sc-dev 2021-03-19 21:15:34 +00:00
Treehugger Robot
55fe87b2f6 Merge changes from topic "bluetooth_oob_api" 
* changes:
  Fix CTS Failure
  Bluetooth: Modify and append to the Out-of-Band API
 2021-03-19 21:13:18 +00:00
Dmitri Plotnikov
9e5cf848fc Fix and re-enable BstatsCpuTimesValidationTest 
Thanks to jji@ for identifying the cause and the fix.

Bug: 180015146
Test: atest FrameworksCoreTests:com.android.internal.os.BstatsCpuTimesValidationTest
BYPASS_INCLUSIVE_LANGUAGE_REASON=Using a legacy command, cmd deviceidle whitelist

Change-Id: I1dd2402719d5ae7752300b72a5afe3740ac7498a
 2021-03-19 14:11:10 -07:00
Christian Wailes
d6c3dfb3ff Merge "Update OWNERS file" 2021-03-19 20:59:11 +00:00
TreeHugger Robot
e463f4c151 Merge "Correct recycling to take setViewId into account." into sc-dev 2021-03-19 20:38:30 +00:00
Jeff Sharkey
cc506c3882 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: I60706a7e6b932a322720632017596f7e75bc9880
 2021-03-19 20:36:01 +00:00
Chris Tate
c243f46c6f Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev 2021-03-19 20:27:43 +00:00
Branden Archer
30491b1daf Merge "Allow PO to enable security logging on work profile" into sc-dev 2021-03-19 20:24:30 +00:00
Shuzhen Wang
71ca7dff7e Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I16a4e5430872102f2650845d29f4a7ee7a4c7580
 2021-03-19 20:20:07 +00:00
TreeHugger Robot
452d2916b9 Merge "Limit primary text color to notification shelf icons" into sc-dev 2021-03-19 20:15:02 +00:00
Jeff Sharkey
32e4b44b47 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Ic7929a7dea98f94a3e3d4082eeace63d6c6fe714
 2021-03-19 19:56:11 +00:00
Matt Casey
b8090a0c40 Layout and style updates for LongScreenshotActivity 
- Give save button accent color.
- Remove cancel button (may come back in another form later)
- Share button becomes and icon on the right.
- Edit button moves to the bottom, gets icon + text

Bug: 180967468
Test: Visual eval with light and dark themes
Change-Id: I19ccea06e7dbec47b26ffd0684ebb7e31bdfe8b4
 2021-03-19 15:55:08 -04:00
Jordan Liu
1dfc25617a Make backport_s_notif_rules readable 
Bug: 182313963
Test: atest
Change-Id: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea
(cherry picked from commit a5792f7402)
Merged-In: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea
 2021-03-19 19:52:00 +00:00
Haining Chen
18e3b6aa9c Add nullability annotations and imports 
Bug: 156024031

Test: m -j
Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics
Test: atest CtsBiometricsTestCases
Change-Id: I46a38b6c02452a77c65c3bcb707c5db31c3a4ece
 2021-03-19 12:43:57 -07:00
Nate Myren
c3d290dcec Merge "Clarify AudioRecord.Builder.setContext documentation" into sc-dev 2021-03-19 19:42:31 +00:00
TreeHugger Robot
c8593c879e Merge "Grant permission to shell for ResourceObserverNativeTest" into sc-dev 2021-03-19 19:41:18 +00:00
Felipe Leme
5395b2af57 Lazy load the allocation of Slog message formatting objects. 
Test: manual verification looking at logcat output
Fixes: 182963900

Change-Id: If62ccfe085b20cda8755fefc3ec757ad59986685
 2021-03-19 12:39:19 -07:00
Shuzhen Wang
7b8379f55d Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: Ib5a8d564723118065ef7a2b9e971f588f086ea2f
 2021-03-19 19:35:38 +00:00
Jeff Sharkey
d702544c9f Merge "OWNERS for a few Voice Interaction files." 2021-03-19 19:21:48 +00:00
Ying Xu
5a34763729 Merge "Use different slots for no_calling and call_strength icons" into sc-dev 2021-03-19 19:06:41 +00:00
Christine Franks
5590c983c1 Merge "Fix order of params in color display help doc" into sc-dev 2021-03-19 19:06:25 +00:00
Julia Reynolds
e363bcdbfa Merge "Be more specific about media statuses" into sc-dev 2021-03-19 19:01:23 +00:00
Shuzhen Wang
f1f504042a Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I537e8fab411b8134cf43d71790ebe62d238a71b6
 2021-03-19 18:58:14 +00:00