Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,249 Commits 3 Branches 0 Tags
deae160ccbd85dddbd460ed05b427e2454412eae
Commit Graph

635249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
deae160ccb Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407 am: 1a71a8825b am: 5fb05e5201 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: I2d79b01531a0ad8c123c8382699311d0cdc97f89
 2021-03-19 23:07:15 +00:00
Martin Brabham
812e076bb7 [automerger skipped] Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3 am: b4f9ff1810 am: a4d053d2e1 -s ours am: e1985289e8 -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: Ic794c98bba5c947ebd10868a5137b4a8560444b7
 2021-03-19 23:07:09 +00:00
Christian Wailes
333d8c4133 Merge "Update OWNERS file" am: d6c3dfb3ff am: 4f5e3b92f7 am: f1eb6c7bf4 am: cbc2ac29ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: Ic7e1727226f169fcb4a12ed627e6c22b40508c2f
 2021-03-19 23:06:26 +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
d5402f58b8 Merge "UX feedback for ripple" into sc-dev am: ed182a33e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931326

Change-Id: Iff72aac0ef40ed01e0529de2dbdfd5145277f842
 2021-03-19 22:50:00 +00:00
Lucas Dupin
ed182a33e1 Merge "UX feedback for ripple" into sc-dev 2021-03-19 22:49:50 +00:00
Ryan Mitchell
7514573c6f Merge "OMS: Update PM on main thread with lock" into sc-dev am: 094d0adb13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13587545

Change-Id: I6ad97c3cac5e37390177f415da239ace3200d2a6
 2021-03-19 22:49:11 +00:00
Dmitri Plotnikov
bb08a43a7d Merge "Fix and re-enable BstatsCpuTimesValidationTest" into sc-dev am: 31c3622909 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930617

Change-Id: I7b38ec25c3f543fce878b021317e93675a853be1
 2021-03-19 22:48:17 +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
Curtis Belmonte
935453c0b5 Merge "Add placeholder sensor ID to biometric event logs" into sc-dev am: a5a930725f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855855

Change-Id: Ifdc33889705e9b0635e824293230907c05ed6e8b
 2021-03-19 22:45:37 +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
TreeHugger Robot
2a95b38c37 Merge "Fix ContextHubManager docs" into sc-dev am: 54580409da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921507

Change-Id: Ie0bb66e38c6378c18da9d1233f51cfd440aa5595
 2021-03-19 22:10:05 +00:00
TreeHugger Robot
4bcba57a8d Merge "Add nullability annotations and imports" into sc-dev am: 3d345db0a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931662

Change-Id: I6ed7c3fb64569b5eeba01675160032fd70898ece
 2021-03-19 22:09:41 +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
71f60627fc Merge "Add light reveal for auth from aod" into sc-dev am: 30d9c2d2de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13888417

Change-Id: I1d84ea18f6f9326804b54ddcbc81bdb9484cabd9
 2021-03-19 22:08:56 +00:00
TreeHugger Robot
54580409da Merge "Fix ContextHubManager docs" into sc-dev 2021-03-19 22:08:13 +00:00
TreeHugger Robot
cd8df7b399 Merge "Fix CDM logcat spam when device is nearby" 2021-03-19 22:07:15 +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
Jeff Sharkey
abfd883b8d Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47 am: cc506c3882 am: e0f6165387 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Ie95fffaff13c9b04ace0ff05d46f6cbe6c2a3c93
 2021-03-19 21:50:29 +00:00
TreeHugger Robot
ceb6bd125c Merge "Add support for stretch overscroll to internal ViewPager" into sc-dev am: 72f1c8bca4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828644

Change-Id: I2534f2d3092806f3b4cc468e4996b0ef43764b61
 2021-03-19 21:50:05 +00: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
Julia Reynolds
58949f6da8 Merge "Provide more specific notification cancelation reasons" 2021-03-19 21:23:45 +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
ce2cde0427 Merge "Correct recycling to take setViewId into account." into sc-dev am: e463f4c151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929330

Change-Id: Ia8c0ea6a1a3d20081c11550cca5a1c6cedca80f2
 2021-03-19 20:55:39 +00:00
TreeHugger Robot
e463f4c151 Merge "Correct recycling to take setViewId into account." into sc-dev 2021-03-19 20:38:30 +00:00
Chris Tate
e4d9c67014 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev am: c243f46c6f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacab172654c6f35ec44f1bb19c8a708230605a1c
 2021-03-19 20:38:09 +00:00
Branden Archer
2e41d9372b Merge "Allow PO to enable security logging on work profile" into sc-dev am: 30491b1daf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13744888

Change-Id: I89d18d88338c7078cc2399b5377f52ad25f576c2
 2021-03-19 20:37:47 +00:00
Shuzhen Wang
3e10cef517 Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d am: 71ca7dff7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I8a16120f2592327690e394e453f5e6223b8e7444
 2021-03-19 20:36:06 +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
85d151bd93 Merge "Limit primary text color to notification shelf icons" into sc-dev am: 452d2916b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930906

Change-Id: I1dfb13f7a1a3cdc20c28c01d7984b22e5a27eb5e
 2021-03-19 20:16:14 +00:00
Jordan Liu
09d91d0642 [automerger skipped] Make backport_s_notif_rules readable am: 1dfc25617a -s ours 
am skip reason: skip tag Change-Id I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea with SHA-1 a5792f7402 is already in history

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

Change-Id: I01ffb0eadb2be9cc5e77fd7221ff7cf9386a77d7
 2021-03-19 20:16:03 +00:00
Nate Myren
d86bbd1b4f Merge "Clarify AudioRecord.Builder.setContext documentation" into sc-dev am: c3d290dcec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901977

Change-Id: I41a9ed517b6d12c838ac9c5e72c11f35a490e889
 2021-03-19 20:15:52 +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
TreeHugger Robot
31395c10a1 Merge "Grant permission to shell for ResourceObserverNativeTest" into sc-dev am: c8593c879e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13903088

Change-Id: I303b101d12ec4649cd9e1304f7ee2b82eeb465d2
 2021-03-19 19:56:43 +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