Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,800 Commits 3 Branches 0 Tags
2f3abb44411db58e98b64644adee9633fc504e7d
Commit Graph

640800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bookatz
2f3abb4441 BatteryUsageStats atom - frameworks/base 
Writes the BatteryUsageStats atoms.proto atoms
based on the current BatteryUsageStats data in BatteryStats.

Does NOT write the past pre-reset snapshot atoms; that is
an adventure for a future cl.

Bug: 184095105
Test: atest BatteryUsageStatsProtoTests
Test: statsd_testdrive <atomId>
Change-Id: I2fc5a983deb58d7d393c0696db2165b124c94dc2
 2021-05-13 11:40:26 -07:00
Joe Hsu
c73c098665 Merge "Check FontFamily null before adding it." into sc-dev 2021-05-13 01:59:02 +00:00
Wei Sheng Shih
a9cbf391e0 Merge "Enable app reveal animation after splash screen." into sc-dev 2021-05-13 01:40:49 +00:00
Wei Sheng Shih
0287fee40f Merge "Fix ActivityRecord leak if starting window was transferred." into sc-dev 2021-05-13 01:37:10 +00:00
Dmitri Plotnikov
b5d43c6b71 Merge "Do realistic data mocking in BluetoothPowerCalculatorTest" into sc-dev 2021-05-13 01:22:04 +00:00
TreeHugger Robot
1e1c864bc1 Merge "Fix BatteryStats Screen On timer reset" into sc-dev 2021-05-13 00:55:43 +00:00
TreeHugger Robot
5c681088e4 Merge "More benchmark tweaks" into sc-dev 2021-05-13 00:53:03 +00:00
TreeHugger Robot
ef36e9f960 Merge "Move boot test to postsubmit" into sc-dev 2021-05-13 00:13:07 +00:00
Joe Bolinger
7f40c4b4ef Merge "Respond to lockout reset requests from the HAL." into sc-dev 2021-05-13 00:12:53 +00:00
Cody Kesting
be6088d11c Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 am: 5cdc27d2ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I7d636497dbc26008e659495e4236f161c90599ab
 2021-05-12 23:40:05 +00:00
Linzhao Ye
5423b6dfc2 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 am: 27095d7536 am: c985b4066c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: I72dbe8a141f29c4621bc6036a8aff39eb04e79a8
 2021-05-12 23:39:30 +00:00
TreeHugger Robot
bf25b68828 Merge "mLocalDeviceIdleController could be null." into sc-dev 2021-05-12 23:33:51 +00:00
Jeff DeCew
cd86f38402 Merge "Allow populating left_icon independently of right_icon." into sc-dev 2021-05-12 23:32:35 +00:00
John Reck
3920768c72 More benchmark tweaks 
Bug: 187718492
Test: this
Change-Id: Ie0cad91e1c7d1a02704fc4b1007ba2c28cb2b3e7
 2021-05-12 19:29:03 -04:00
TreeHugger Robot
85dda65c28 Merge "Clarify the semantics of ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" into sc-dev 2021-05-12 23:28:51 +00:00
TreeHugger Robot
bb793e1b1f Merge "Exclude scrim padding when calculating stack height on lockscreen" into sc-dev 2021-05-12 23:22:01 +00:00
Michael Wachenschwanz
96906f72e3 Fix BatteryStats Screen On timer reset 
StopwatchTimer reset uses elapsedRealtime not uptime

Bug: 187844042
Test: builds + boots
Change-Id: I82286d74fef6256971361e70a787a2b39a7cbba4
 2021-05-12 16:19:02 -07:00
Cody Kesting
5cdc27d2ac Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I31a2eda921b88ebe0c70492e39f4b448f6c91b93
 2021-05-12 23:15:28 +00:00
Linzhao Ye
c985b4066c Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 am: 27095d7536 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: Ie7d9c32025213c7fc089dff38be142caa15df9c7
 2021-05-12 23:15:14 +00:00
Aurimas Liutikas
b357fadd1e Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc am: 51a1b7d082 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118
 2021-05-12 23:09:41 +00:00
Dmitri Plotnikov
9828eb9044 Do realistic data mocking in BluetoothPowerCalculatorTest 
Bug: 187461241
Test: atest FrameworksCoreTests:BluetoothPowerCalculatorTest

Change-Id: I7974bd2ba434855a4b30e47b3e68e0a0569eb3f5
 2021-05-12 16:09:27 -07:00
Cody Kesting
cd4e6ae6d6 Merge changes I4b135749,If4fcaa52 am: 576dad4673 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: Iad5fd7d7e39cb0a19f7fc87b09c600a7e7b7ecd8
 2021-05-12 23:03:26 +00:00
Linzhao Ye
27095d7536 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: I5623a9e742efc094418e91e9c830e8c08691f3ba
 2021-05-12 23:00:31 +00:00
Cody Kesting
576dad4673 Merge changes I4b135749,If4fcaa52 
* changes:
  Restructure Test Network requests for VCN connections.
  Correct variable name in VcnManagementService.
 2021-05-12 22:55:17 +00:00
Aurimas Liutikas
51a1b7d082 Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: I39fdc7fb9ad8109e51e2d3bdee1bc4fb3354a247
 2021-05-12 22:52:55 +00:00
Dmitri Plotnikov
dd9dcdfb72 Merge "Fix device-level wakelock battery attribution" into sc-dev 2021-05-12 22:52:41 +00:00
Lorenzo Colitti
79d74a6448 Merge changes from topic "transportinfo-explicit-redaction" into sc-dev 
* changes:
  Immediately redact VcnTransportInfo.
  Do not automatically redact TransportInfo objects.
 2021-05-12 22:46:36 +00:00
Linzhao Ye
5c1879cb60 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." 2021-05-12 22:44:31 +00:00
Chris Li
806b5b8ed6 Merge "Determine whether to support activities in multi window (5/n)" into sc-dev 2021-05-12 22:37:41 +00:00
TreeHugger Robot
4d2b82b01f Merge "Do not ignore views that are GONE" into sc-dev 2021-05-12 22:21:32 +00:00
Aurimas Liutikas
c2db9c85cc Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: Ic447f14fbeab4215efc758f301b626bc21766b31
 2021-05-12 22:20:32 +00:00
Jean-Michel Trivi
3009a4d87d Merge "AudioService: fix AVRCP absolute volume reset" into sc-dev 2021-05-12 22:06:59 +00:00
Aurimas Liutikas
f1e2bb9a81 Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" 2021-05-12 22:03:25 +00:00
TreeHugger Robot
9d7540c17e Merge "Atoms.proto PROFILE_CLONE entry" into sc-dev 2021-05-12 22:02:45 +00:00
Ahaan Ugale
f60fbc10b5 Merge "Nullability fixes for HotwordDetectionService APIs." into sc-dev 2021-05-12 21:56:54 +00:00
Aurimas Liutikas
c5b4071877 Revert "Fix incompatibilities with Kotlin 1.5.0" 
This reverts commit b8ca1157ab.

Reason for revert: b/187908823

Change-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d
 2021-05-12 21:56:31 +00:00
Stevie Kideckel
9a0e124b1a Merge "Performance/jank improvements to AnalogClock" into sc-dev 2021-05-12 21:49:28 +00:00
Jeff Sharkey
a224ffb28f Merge "Grant "Nearby devices" to Bluetooth MIDI service." into sc-dev 2021-05-12 21:45:16 +00:00
Hui Yu
0a986df19d mLocalDeviceIdleController could be null. 
Bug: 187965254
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
Change-Id: Iacb371fdacfd9a927e13472c3fcc114baaa7060a
 2021-05-12 14:36:34 -07:00
Ben Lin
4c21ac8f33 Merge "PiP: Update menu state AFTER animation is done for show/hide/resize." into sc-dev 2021-05-12 21:34:48 +00:00
Ben Lin
8c39ee10d3 Merge "PiP: Recheck condition to pass input to menu." into sc-dev 2021-05-12 21:33:01 +00:00
Dmitri Plotnikov
59dd00ce46 Fix device-level wakelock battery attribution 
Bug: 187844042
Test: atest FrameworksCoreTests:WakelockPowerCalculatorTest
Change-Id: I4e14d962db37adeafb793022b50da0065628238c
 2021-05-12 14:21:12 -07:00
TreeHugger Robot
c70b38a9f8 Merge "Add transferTouch api" into sc-dev 2021-05-12 21:15:04 +00:00
Lyn Han
2e2ac20e52 Exclude scrim padding when calculating stack height on lockscreen 
Since we don't use notification background scrim on lockscreen

Bug: 187195324
Test: lockscreen stack height looks correct
Change-Id: Id66da679c39fdec488318f6f920fa90241d17115
 2021-05-12 21:11:40 +00:00
TreeHugger Robot
c42a70fab2 Merge "Reset the color settings if the wallpaper changes" into sc-dev 2021-05-12 21:10:09 +00:00
Leon Scroggins
5183641bef Merge "PIP: Always enable rounded corners" into sc-dev 2021-05-12 21:02:05 +00:00
TreeHugger Robot
c9216d334b Merge "Provide proper transform to mask canvas" into sc-dev 2021-05-12 20:57:56 +00:00
TreeHugger Robot
7ae30966d9 Merge "Try to draw with given font before updating" into sc-dev 2021-05-12 20:54:21 +00:00
TreeHugger Robot
8e96a04385 Merge "Set the correct default in quick_qs_status_icons" into sc-dev 2021-05-12 20:52:11 +00:00
Kevin Chyn
8404904b26 Merge changes I2339e806,Ic7eaddc4 into sc-dev 
* changes:
  Do not show fingerprint icon/circle underneath moving target
  Enlarge UDFPS enrollment progress bar
 2021-05-12 20:50:31 +00:00