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

635290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Stout
e763afd941 Merge "Only create DPCs for LocalDisplays & FLAG_OWN_DISPLAY_GROUP" into sc-dev am: dcdb236a6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13928250

Change-Id: If803bdbb0317aa0b6347e357e9c5d1c985e00162
 2021-03-22 13:07:09 +00:00
TreeHugger Robot
03d37e9023 Merge "Lazy load the allocation of Slog message formatting objects." into sc-dev am: 864c714d77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13932384

Change-Id: I35a081e28ec8f716330df49bf520a49f29ec6ea3
 2021-03-22 13:06:51 +00:00
Tyler Gunn
f4e27d43e2 Merge "Propagate call quality reports from Telephony to CallDiagnosticService." into sc-dev am: 5bb6b8ad57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13878696

Change-Id: I4cfa9936d1f2b46005df52e943adeffa5680d08c
 2021-03-22 13:06:29 +00:00
TreeHugger Robot
9e4e8cd13e Merge "Updates to API based on API council feedback." into sc-dev am: 9f15b8d17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891798

Change-Id: I8d0ac1cce55dd0795aaf679da52b5a0ddb15b29e
 2021-03-22 13:05:20 +00:00
Bob Badour
1dba67a98a Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: de3fb7e9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13923004

Change-Id: Icfde671b0753b1553e0dbbdc6de4c35d06febeac
 2021-03-22 13:02:52 +00:00
JW Wang
71eb96cf66 Merge changes from topic "181092466_1" 
* changes:
  Move version code checking out of StagingManager (3/n)
  Restart verification for committed sessions that are not READY (2/n)
  Do APK verification before committing sessions to StagingManager (1/n)
 2021-03-22 02:18:20 +00:00
TreeHugger Robot
5c66817292 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-21 03:30:50 +00:00
TreeHugger Robot
a8f9c385b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 18:03:33 +00:00
TreeHugger Robot
dffdc2885c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 17:44:41 +00:00
TreeHugger Robot
8200a1206d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 17:40:48 +00:00
Bill Yi
dede9994c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I46a9ab3303c0106ccb8c21cb4911e0d5d916e294
 2021-03-20 13:05:10 +00:00
Bill Yi
fc2c87d78c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I55f139f5a494d77768fa7b808a087ff9754bc90c
 2021-03-20 12:46:25 +00:00
Bill Yi
b65e29dfe4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4d3b9dbb96ea0bcb0bdfc5e83ae0fad68531c5a2
 2021-03-20 11:51:33 +00:00
Bill Yi
c3bced8654 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I672bdc26f142efa60862bb1472bd90b6c824c3f6
 2021-03-20 04:50:22 +00:00
TreeHugger Robot
9c5f362815 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-20 04:36:23 +00:00
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
0e4fb1b8b3 Merge "Update DOMAIN_VERIFICATION_AGENT to internal|privileged" into sc-dev am: 0b6d627ebe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13880977

Change-Id: I0bee7be7f501cd34bf919975fbad898ae6f87611
 2021-03-20 00:04:56 +00:00
Nikita Dubrovsky
50c31a58b3 Merge "Integrate OnReceiveContentListener in View.onDragEvent" into sc-dev am: 1b2051e372 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13854250

Change-Id: Icc8ce442e0ced942b44eeb92510a662c85e30e91
 2021-03-20 00:04:26 +00:00
Matt Casey
786abe28f1 Merge "Layout and style updates for LongScreenshotActivity" into sc-dev am: 6e67c50402 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931036

Change-Id: I2c823e24627c4f390b15dd3f255996f20ed67fee
 2021-03-20 00:03:46 +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
Bill Yi
ab0b8a3f6d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5eda0bc3531907eb4c62c3d28cccb0437a14fecb
 2021-03-19 23:58:02 +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
1fa5c69247 Merge "Add shell control for disabling blur" into sc-dev am: c3f3255c38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13919187

Change-Id: I9ed85f2c579fd3a681dfb55fd159460fba3f3f8b
 2021-03-19 23:24:56 +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
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