Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
625,595 Commits 3 Branches 0 Tags
f07f50aa005a75ec828ae557f44458c8cd9bb01d
Commit Graph

15604 Commits

Author SHA1 Message Date
Adam Bookatz
072a8ab081 Merge "BatteryStats receives custom measured energies" into sc-dev am: 420a8ca343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13526643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6475ab872f1ba59c8e361c4668a7a1c56112070
 2021-02-11 08:48:46 +00:00
Adam Bookatz
420a8ca343 Merge "BatteryStats receives custom measured energies" into sc-dev 2021-02-11 08:22:25 +00:00
Fiona Campbell
6c091873be Merge "Move BrightnessSynchronizer to a display-specific folder." into sc-dev am: 1a6f0cda46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13497065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie285660b409d9c0ecf61e55e90d0e120ac7f7958
 2021-02-11 07:38:13 +00:00
Fiona Campbell
1a6f0cda46 Merge "Move BrightnessSynchronizer to a display-specific folder." into sc-dev 2021-02-11 07:27:06 +00:00
TreeHugger Robot
fc495f5eb2 Merge "Fix privapp permission allowlisting." into sc-dev am: 9ab53621d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13480932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib17b1d16399c24b08fc766ea667e885c11fef92a
 2021-02-11 03:49:35 +00:00
Hai Zhang
e391b19376 Fix privapp permission allowlisting. 
The refactoring in S unintendedly introduced a change that allowed
signature|privileged to be granted to platform-signed privileged apps
without being in the allowlist XML, so we should revert to the old
behavior.

The refactoring was done in the hope that we can have one step that
handles privileged permission granting. However upon retrospection, we
have to do this in two separate steps because the privapp permission
allowlist should always be enforced first.

This change reverts to the old behavior by looking at both the current
code and the R source code, then extracts the privapp permission
enforcement as a separate step that happens first, to be used by both
signature and the new internal permission protection.

Also simplified the check about privileged permission, because vendor
privileged permission is always a privileged permission, as made sure
in PermissionInfo.fixProtectionLevel().

In the mean time, added the missing privapp permission allowlist entry
for Settings and RESTART_WIFI_SUBSYSTEM for device to boot.

Fixes: 179309876
Test: manual
Change-Id: I93cfe7a4621fc5ac65229d42c7a8ebd825ae8ae5
 2021-02-10 16:40:00 -08:00
Dmitri Plotnikov
0aeb4884ed Merge "Make ScreenPowerCalculator use measured energy with BatteryUsageStats" into sc-dev am: e4d66ae2fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13502599

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93272b399798ac27bc98753562c533c57bf8bfaa
 2021-02-10 18:31:08 +00:00
Dmitri Plotnikov
e4d66ae2fe Merge "Make ScreenPowerCalculator use measured energy with BatteryUsageStats" into sc-dev 2021-02-10 18:22:03 +00:00
Adam Bookatz
822ed39c43 BatteryStats receives custom measured energies 
EnergyConsumer data of type OTHER is now pulled and
processed by BatteryExternalStatsWorker.
This means that 'custom energy buckets' energy data is
now available.
It is pulled by BESW, stored/snapshotted in
MeasuredEnergySnapshot, and deltas are sent to
BatteryStatsImpl, which stores them (depending on its
internal state).

MeasuredEnergyArray is removed, in favour of using
EnergyConsumerResults[] directly.

Bug: 176988041
Bug: 174818228
Bug: 179107328
Test: atest BatteryStatsNoteTest
Test: atest FrameworksServicesTests:com.android.server.am.MeasuredEnergySnapshotTest
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: Ib6a88d1579f97bc653cdb67a671f4fdd05f1dfe5
 2021-02-10 09:25:16 -08:00
Fiona Campbell
d87e6c0699 Move BrightnessSynchronizer to a display-specific folder. 
Bug: 159210246
Test: manual
Change-Id: Idbd9a1affd8db66d13f5dd8f173d0e2d557e24d8
 2021-02-10 17:05:55 +00:00
TreeHugger Robot
ed36c17e6a Merge "Read CPU usage for system server thread groups" into sc-dev am: 55cd2f4859 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13495669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I059ee00a759ca280087b52233736fd85a63e88f3
 2021-02-10 14:13:09 +00:00
Rafal Slawik
4661d6aa6d Read CPU usage for system server thread groups 
Add a statsd puller to record CPU usage of system server threads: all
and binder.

Bug: 173227907
Test: cmd stats pull-source 10098
Test: atest CpuStatsTests
Change-Id: I0d5c6e1e8d772bae6efdcbe62767932cc2fefe02
 2021-02-10 11:21:00 +00:00
TreeHugger Robot
675c218827 Merge "Convert CpuPowerCalculator to work with BatteryUsageStats" into sc-dev am: b5f213d886 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13465553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbb22647ebdd1ce322fd2166d68fd609dae9417b
 2021-02-10 04:51:20 +00:00
Dmitri Plotnikov
a84c096ad9 Make ScreenPowerCalculator use measured energy with BatteryUsageStats 
Test: atest FrameworksCoreTests:com.android.internal.os.ScreenPowerCalculatorTest

Bug: 158137862
Bug: 178140704
Change-Id: I8066e0712db88a8825dc973d9efa45fdf70a2ef5
 2021-02-09 19:27:47 -08:00
Dmitri Plotnikov
2199b00cc6 Convert CpuPowerCalculator to work with BatteryUsageStats 
Bug: 158137862
Bug: 175156498
Test: atest CpuPowerCalculatorTest
Change-Id: Ifa7402dc90a572219d1f6eabef89c57dcf6aa2f6
 2021-02-09 17:55:51 -08:00
Jeff DeCew
0c415c0f40 Merge changes from topic "notif_call_style_sc" into sc-dev am: 4db015d00e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13532768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie40afb9b3b131486d30fc0b3d87a95f3b7cc37d9
 2021-02-10 01:27:52 +00:00
Jeff DeCew
4db015d00e Merge changes from topic "notif_call_style_sc" into sc-dev 
* changes:
  Stop using ?attr/notificationHeaderTextAppearance
  Remove unused 'app_ops' from layout
  Implement Notification.CallStyle
 2021-02-10 00:42:26 +00:00
TreeHugger Robot
9900178496 Merge "Convert UserPowerCalculator to work with BatteryUsageStats" into sc-dev am: ca17fb0be4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13439173

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I949fde1f8d59f8ea04628c6eea4d892653542f05
 2021-02-10 00:03:28 +00:00
TreeHugger Robot
ca17fb0be4 Merge "Convert UserPowerCalculator to work with BatteryUsageStats" into sc-dev 2021-02-09 23:54:12 +00:00
Dmitri Plotnikov
be9d9eb47a Convert UserPowerCalculator to work with BatteryUsageStats 
Test: atest FrameworksCoreTests:com.android.internal.os.UserPowerCalculatorTest

Bug: 158137862

Change-Id: Ibfd0138a2e455e2242750518d89c620901326d11
 2021-02-09 12:57:15 -08:00
Jeff DeCew
4118f1ad35 Implement Notification.CallStyle 
Test: atest CtsAppTestCases:NotificationTemplateTest
Bug: 172821692
Fixes: 179218218
Change-Id: Ic37d913946f81a581c26ab1b71f6d6e1bdc6a932
 2021-02-09 11:54:47 -05:00
Eugene Susla
24de1ca1be [DO NOT MERGE] Improvements and fixes for BLE scanning within CDM 
Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
(cherry picked from commit 10a1973972)
 2021-02-08 16:51:49 -08:00
Mitch Phillips
73d00dba31 Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c am: e399fb29d4 am: a78fe42a02 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibaf582b31bed34def5a7996a76e23680b32692ce
 2021-02-08 22:11:58 +00:00
Jeff Sharkey
b7a004f27b Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 am: 0192f22a73 am: 8636af69ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3f07d249d780275379bd1477276f57004cd96d7
 2021-02-08 22:11:43 +00:00
Mitch Phillips
a78fe42a02 Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c am: e399fb29d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I675a403921d5d52eb1d65d2ff74af35517a7cf1f
 2021-02-08 21:39:56 +00:00
Jeff Sharkey
8636af69ca Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 am: 0192f22a73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I276ceb5deb6b2e689c867b27cb8f7395cd42d4f2
 2021-02-08 21:38:20 +00:00
Mitch Phillips
e399fb29d4 Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d5a38c75adbda0553e81235f49aa0aef7a8a3b
 2021-02-08 19:43:53 +00:00
Jeff Sharkey
0192f22a73 Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe90565c3df31a79bafa5a958a4df1ac1192fb0
 2021-02-08 19:43:24 +00:00
Ben Lin
9911627eae Merge "Pass ActivityOptions to HeavyWeightSwitcherAcivity." into sc-dev am: c8227c58fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13476229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c2f776e05b2217a59ffb7528dea54ef598c6b19
 2021-02-08 19:39:53 +00:00
Ben Lin
c8227c58fa Merge "Pass ActivityOptions to HeavyWeightSwitcherAcivity." into sc-dev 2021-02-08 19:28:12 +00:00
Mitch Phillips
4d7b7a71d6 Merge "[MTE] Parse MTE sysprop in system_server" 2021-02-08 18:46:52 +00:00
TreeHugger Robot
915e3c5677 Merge "Adding All Apps CUJs to InteractionJankMonitor" into sc-dev am: 98ed521f0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473061

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icba0f82e5d734d1884fcd6e5ec39794245597b96
 2021-02-08 18:38:12 +00:00
Jeff Sharkey
1cf122b5a7 Merge "Add OWNERS for CPU-related files" 2021-02-08 18:31:18 +00:00
TreeHugger Robot
98ed521f0a Merge "Adding All Apps CUJs to InteractionJankMonitor" into sc-dev 2021-02-08 18:31:11 +00:00
Treehugger Robot
b371a1c255 Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dabacbcd75c98ab81f933ba03f8f97720ba69b6
 2021-02-08 17:23:55 +00:00
Rafal Slawik
d65025e817 Merge "Check if CPU time tracking is expected to work" into sc-dev am: 64454600c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I920dccd78260efb691c8fa9092f0b1dd97bfa062
 2021-02-08 17:11:33 +00:00
Rafal Slawik
ebc11b5899 Add OWNERS for CPU-related files 
This covers files from CLs like:
- http://ag/13495669
- http://ag/13425120
- http://ag/13201721

Bug: n/a
Test: n/a
Change-Id: I7b1ba4e75c57cf53a9fe8b479b9472f627a63e82
 2021-02-08 16:53:22 +00:00
Rafal Slawik
64454600c6 Merge "Check if CPU time tracking is expected to work" into sc-dev 2021-02-08 16:44:23 +00:00
TreeHugger Robot
4b5b7b8049 Merge "am compat reset --no-kill shouldn't kill the process" into sc-dev am: 2c3254c775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13497228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf5591c47f37738157e954aee44c58fd91bc72cd
 2021-02-08 16:39:50 +00:00
TreeHugger Robot
2c3254c775 Merge "am compat reset --no-kill shouldn't kill the process" into sc-dev 2021-02-08 16:34:41 +00:00
Treehugger Robot
39d22680c9 Merge "Do not propogate test api access flags to Zygote." 2021-02-08 15:27:19 +00:00
Treehugger Robot
f9b15d961b Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570cd am: 8151e4c800 am: 255e25fcc3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I945ec7dcc3c89fe7f4cc97b248a16f256f7c0c06
 2021-02-07 21:16:01 +00:00
Treehugger Robot
255e25fcc3 Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570cd am: 8151e4c800 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d24c25a0ab4bde791d1ddba37b9f59c1c1b6bb7
 2021-02-07 20:40:38 +00:00
Treehugger Robot
905c2570cd Merge "Fix a bug in the USAP Pool refill logic." 2021-02-07 19:52:20 +00:00
TreeHugger Robot
5011120e97 Merge "Rename InputConnecton#setImeTemporarilyConsumesInput" into sc-dev am: 3ae84f530b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13482899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic69bc45ea15293d36743aa9280b8a4a1bd9c9fdb
 2021-02-07 03:53:56 +00:00
TreeHugger Robot
3ae84f530b Merge "Rename InputConnecton#setImeTemporarilyConsumesInput" into sc-dev 2021-02-07 03:13:55 +00:00
Josh Gao
496317fc47 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 am: b4d05a90e9 am: e18b895a74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f51c7c42ee249a66bd430f8e4c4282f718ab6f4
 2021-02-05 22:09:35 +00:00
Josh Gao
e18b895a74 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 am: b4d05a90e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dd17a5aae56597a1eb233dd4743b4deb21ef5d9
 2021-02-05 21:45:26 +00:00
Josh Gao
b4d05a90e9 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22b7d2e823d131944d5b02996b8e3e92d2bbc2fa
 2021-02-05 21:13:20 +00:00
Jeff Sharkey
573cabce02 Merge "Add People widgets to those owned by System UI Notifications team" am: 460b1255a9 am: c088d267a1 am: d6e31fbd8b am: e10881e482 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577069

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45752b375c78f9b938ca6057d950b33d78af9926
 2021-02-05 20:36:46 +00:00