Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
628,704 Commits 3 Branches 0 Tags
6da67ebebe3bed9e392fbcfab992ce8b91b814bc
Commit Graph

15742 Commits

Author SHA1 Message Date
Dmitri Plotnikov
6da67ebebe Merge "Add UID time-in-state to UidBatteryConsumer" into sc-dev am: 02073550c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I055a28959af4454a5620c6d040501a8a221818be
 2021-02-26 05:25:43 +00:00
Dmitri Plotnikov
02073550c0 Merge "Add UID time-in-state to UidBatteryConsumer" into sc-dev 2021-02-26 04:51:40 +00:00
Dmitri Plotnikov
f441fbf774 Add UID time-in-state to UidBatteryConsumer 
Bug: 158137862
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsProviderTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsTest
Change-Id: I8fde2f754deaa0d2c4ebb06b9a2c99d60086bc23
 2021-02-25 15:47:20 -08:00
Adam Bookatz
e16101698d Merge "MeasuredEnergyStats - remove unused accumulate parameter" into sc-dev am: 84fc40ad81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13563507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5b988fbcad1a5564bbcc66ccb80e93b6ae06b4a
 2021-02-25 22:10:07 +00:00
Adam Bookatz
84fc40ad81 Merge "MeasuredEnergyStats - remove unused accumulate parameter" into sc-dev 2021-02-25 21:55:02 +00:00
TreeHugger Robot
783f21bda6 Merge "Convert WifiPowerCalculator to work with BatteryUsageStats" into sc-dev am: 2863f6a40d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13486648

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d10027d87c517e9e5f5704e61d59877e64b41fb
 2021-02-25 20:27:05 +00:00
TreeHugger Robot
2863f6a40d Merge "Convert WifiPowerCalculator to work with BatteryUsageStats" into sc-dev 2021-02-25 20:15:38 +00:00
Adam Bookatz
26b0a0864c MeasuredEnergyStats - remove unused accumulate parameter 
The parameter was always true (it was a remnant of a previous
approach).

Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Bug: 174818228
Change-Id: I3be5392966c3455b2df145044809a581abbf245c
 2021-02-25 11:02:17 -08:00
Evan Severson
ecf2837b41 Merge "Expose SensorPrivacy as SystemApi" into sc-dev am: 445abca30e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I310df792ad039f5dad97875457905df8bb1c6602
 2021-02-25 18:41:13 +00:00
Evan Severson
445abca30e Merge "Expose SensorPrivacy as SystemApi" into sc-dev 2021-02-25 18:29:43 +00:00
Zoey Chen
200d037595 Merge "[Telephony] Store correct value for multi-sim case - DataEnabled" into sc-dev am: da74086ba4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13612049

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d0a9762105e697981b479f4377a266e1bc0e39e
 2021-02-25 14:44:52 +00:00
Alex Buynytskyy
99afc66507 Merge "API feedback: getVersion instead of isV2." into sc-dev am: 02492968c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676256

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedc9f7ed0ccd583c462ddb740e38fefed11db9af
 2021-02-25 14:35:37 +00:00
Adam Bookatz
32768fd60d Merge "BatteryStats custom buckets: don't revive dead Uids" into sc-dev am: 0b905b1ef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13679511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a8954b852f26216bab3bdb21ab44d4e3168c5d4
 2021-02-25 14:34:16 +00:00
Zoey Chen
da74086ba4 Merge "[Telephony] Store correct value for multi-sim case - DataEnabled" into sc-dev 2021-02-25 13:31:04 +00:00
Alex Buynytskyy
414d9ecc26 API feedback: getVersion instead of isV2. 
Bug: 181015045
Fixes: 181015045
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I623f73b834759d9a1c599d7c7f3ff585fa75c4aa
 2021-02-25 02:06:08 +00:00
Adam Bookatz
0b905b1ef4 Merge "BatteryStats custom buckets: don't revive dead Uids" into sc-dev 2021-02-25 00:26:14 +00:00
Evan Severson
0f9d5aea50 Expose SensorPrivacy as SystemApi 
Rename the apis to be more consistent.
Also expose to test api.
Have the aosp mark that it supports the toggle features by default.

Test: atest CtsSensorPrivacyTestCases
Bug: 162549680

Change-Id: Ib38c16adfc5cec931347e1a1891618983d78248b
 2021-02-24 15:39:19 -08:00
Flavio Fiszman
50606c9af2 Merge "Simplify onNotificationClear signature" into sc-dev am: 491cbd85c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If083b09fabf0ef94cfb25210262d9879d1ab8498
 2021-02-24 22:56:52 +00:00
Flavio Fiszman
491cbd85c8 Merge "Simplify onNotificationClear signature" into sc-dev 2021-02-24 22:32:17 +00:00
James O'Leary
2b416cd6c2 Merge "Revert^2 "[framework] Integrate new quantizers"" into sc-dev am: 7edf52d602 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13688547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b0263b3b455044636b5a6ff8b322cfc13397760
 2021-02-24 22:14:15 +00:00
James O'Leary
7edf52d602 Merge "Revert^2 "[framework] Integrate new quantizers"" into sc-dev 2021-02-24 21:59:47 +00:00
Adam Bookatz
5bb1ec89d3 BatteryStats custom buckets: don't revive dead Uids 
It is possible for old uids to be reported to BatteryStats
in updateCustomMeasuredEnergyDataLocked().
This can happen, e.g., if a uid was uninstalled between
successive custom energy updates, so that the uid did use non-zero
energy but BatteryStats doesn't care anymore since the uid is gone.
If this happens,
we don't want to recreate any removed Uid objects, so we need
to be careful to only consider Uids that aren't removed.

In practice, this method will only be called after the CPU update,
which means that BatteryStats should already know about all active
uids (assuming they used CPU). Therefore, there shouldn't be any
unknown uids actively using custom energy buckets at this point.
We therefore simply ignore any unknown uids (just log them), on
the assumption that they refer to removed uids or stopped users.

Test: atest BatteryStatsTests
Bug: 180030409
Change-Id: If4fee7a1d11b148ca16d464d6ce4720c5a251130
 2021-02-24 21:30:59 +00:00
James O'Leary
9d3ad10eb9 Revert^2 "[framework] Integrate new quantizers" 
96169052c4

Change-Id: Idefcf279b9fedeeaa29f75e705adfb60f0ad5c8a
 2021-02-24 17:09:06 +00:00
Song Hu
5630022884 Merge "Implement dark launch logic for sharesheet aiai model. Route the sharesheet user interaction from PeopleService to Remote Prediction Service, while PeopleService is making inference for sharesheet. It is guarded by the flag "adb shell device_config put systemui dark_launch_remote_prediction_service_enabled true"" 2021-02-24 14:14:34 +00:00
Flavio Fiszman
462f2579d5 Simplify onNotificationClear signature 
Change-Id: Ib944418dea78fb090c70206c34519f9248a02c04
Test: NotifCollectionTest and NotificationManagerServiceTest
Bug: 172575678
 2021-02-24 13:31:45 +00:00
Zoey Chen
4d459c28db [Telephony] Store correct value for multi-sim case - DataEnabled 
Bug: 180438087
Text: manual and make
Change-Id: I4bcb66d125be582f3392f4c5af1471849a0fe9b1
 2021-02-24 18:22:36 +08:00
Wu Ahan
620a10983d Merge "Send broadcast to notify the events of a CUJ session" into sc-dev am: f6ed5fc57c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1e8fa12ffd72f180aff25304beb2bf27964b217
 2021-02-24 03:03:59 +00:00
Wu Ahan
f6ed5fc57c Merge "Send broadcast to notify the events of a CUJ session" into sc-dev 2021-02-24 02:48:48 +00:00
Song Hu
51daca2ea3 Implement dark launch logic for sharesheet aiai model. Route the sharesheet user interaction from PeopleService to Remote Prediction Service, while PeopleService is making inference for sharesheet. 
It is guarded by the flag "adb shell device_config put systemui dark_launch_remote_prediction_service_enabled true"

Test: test on local device
Bug: 180933488
Change-Id: I7db52c69224e69ad3125362185e2ffd1a474bb78
 2021-02-23 17:49:51 -08:00
Lucas Dupin
8a092cc39a Merge "Revert "[framework] Integrate new quantizers"" into sc-dev am: e36c4de103 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13679700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b1f05562c2c46aba8f541179c6004634b5c890
 2021-02-24 01:23:45 +00:00
Lucas Dupin
e36c4de103 Merge "Revert "[framework] Integrate new quantizers"" into sc-dev 2021-02-24 01:00:49 +00:00
James O'Leary
96169052c4 Revert "[framework] Integrate new quantizers" 
Revert "[sysuig] Integrate Monet color extraction to theme algorithm"

Revert submission 13554372-kahuna

Reason for revert: Colors on some wallpapers shifted, and Lucas found a couple big reasons why, would rather revert a revert tomorrow than fix forward today
Reverted Changes:
I2c3df9f71:[sysuig] Integrate Monet color extraction to theme...
I0fc60a134:[framework] Integrate new quantizers

Change-Id: I7eb8e4fde243bf62e8c750f88028db0a427560b5
 2021-02-24 00:33:02 +00:00
TreeHugger Robot
c95de73565 Merge "Revert "Do not propogate test api access flags to Zygote."" into sc-dev am: 9132e2def2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13669305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I236660d9a1808dce5b02d4261fc4651501868ab4
 2021-02-23 21:51:59 +00:00
TreeHugger Robot
9132e2def2 Merge "Revert "Do not propogate test api access flags to Zygote."" into sc-dev 2021-02-23 21:12:41 +00:00
James O'Leary
a8bc221e63 Merge "[framework] Integrate new quantizers" into sc-dev am: c7d315947d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13553700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4db79eb69b8a2fb619d04b7b7b9ef2320655ad0
 2021-02-23 20:25:01 +00:00
James O'Leary
c7d315947d Merge "[framework] Integrate new quantizers" into sc-dev 2021-02-23 20:20:39 +00:00
satayev
cb9fb0aaaf Revert "Do not propogate test api access flags to Zygote." 
This reverts commit bff33b8c31.

Reason for revert: cts tests on -user builds is broken

Bug: 147113465
Change-Id: I2edf200561f839e49e067403714ea6fa65bdc978
 2021-02-23 18:28:32 +00:00
Taran Singh
5b83255e69 Merge "Avoid IME restart for configChanges" into sc-dev am: 6ba3501f98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a7461a97bb7b337ee92589f906b33a390a31fa6
 2021-02-23 15:38:05 +00:00
Taran Singh
6ba3501f98 Merge "Avoid IME restart for configChanges" into sc-dev 2021-02-23 15:04:42 +00:00
Tony Huang
ba7dab1b76 Merge "Make AppTransition animations sharable (2/n)" into sc-dev am: f9a0ccc0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425250

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d9b0286583e5b8c061826faf23c63c4224fb5ca
 2021-02-23 10:18:45 +00:00
Tony Huang
f9a0ccc0e7 Merge "Make AppTransition animations sharable (2/n)" into sc-dev 2021-02-23 09:26:05 +00:00
TreeHugger Robot
82d7412314 Merge "Further reduce LM memory cost" into sc-dev am: d2191dbad6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13545880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dd157ecadf13724d68ddd197c155014e74d7f37
 2021-02-22 22:16:08 +00:00
TreeHugger Robot
d2191dbad6 Merge "Further reduce LM memory cost" into sc-dev 2021-02-22 21:29:42 +00:00
Rafal Slawik
b3c8890111 Merge "Manage time_in_state tracking from one place" into sc-dev am: e4244b9d73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13580619

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c54dcf44bd581d9cda10fa28c5c97f721e42b4c
 2021-02-22 20:55:43 +00:00
Rafal Slawik
e4244b9d73 Merge "Manage time_in_state tracking from one place" into sc-dev 2021-02-22 19:44:45 +00:00
Dmitri Plotnikov
80c0c66edc Convert WifiPowerCalculator to work with BatteryUsageStats 
Also, combine WifePowerCalculator and WifiPowerEstimator: they
have a lot more in common than different.

Bug: 158137862
Test: atest WifiPowerCalculatorTest

Change-Id: Ib937102043a1fe04941ecfd09b5077b14058e6ef
 2021-02-22 11:35:14 -08:00
Ahan Wu
320858c56f Send broadcast to notify the events of a CUJ session 
Send broadcast to notify the CUJ events to who is interested in.

Bug: 171912046
Test: atest FrameworksCoreTests:InteractionJankMonitorTest
Test: atest FrameworksCoreTests:FrameTrackerTest
Change-Id: I91ab025385c635d15d7be6f7f12597e8900e2e5d
 2021-02-22 19:24:56 +00:00
Soonil Nagarkar
514b570725 Merge "Added attribution tag to note listener" into sc-dev am: 7aa01124c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13563045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f5abdec24ce6c2d2ebcf317e2a520c0b95e183a
 2021-02-22 17:35:13 +00:00
Soonil Nagarkar
7aa01124c4 Merge "Added attribution tag to note listener" into sc-dev 2021-02-22 17:25:24 +00:00
Rafal Slawik
e7f1410a90 Manage time_in_state tracking from one place 
Move functionality related to CPU time_in_state tracking to the
KernelCpuBpfTracking class:
- when to attach the eBPF program to start tracking
- provide available CPU frequencies
- provide CPU cluster (policy) information
- unify the interface of KernelCpuTotalBpfMapReader with other readers

This removes the dependency on the power profile when reading the
information about available frequencies and clusters. It also reduces
the code duplication for transforming that information in
StatsPullAtomService.

Bug: 179485697
Test: existing tests pass
Test: atest CpuStatsTests
Test: cmd stats pull-source 10010
Test: cmd stats pull-source 10095
Test: cmd stats pull-source 10096
Test: cmd stats pull-source 10098
Test: atest FrameworksCoreTests
Change-Id: I17041014343da167b8bdf027ad83887e78ba5c2d
 2021-02-22 10:37:58 +00:00