Commit Graph

15573 Commits

Author SHA1 Message Date
Kohsuke Yatoh
d3279fa99c Merge "Add FontManager#updateFontFamily() API." into sc-dev 2021-02-16 18:32:58 +00:00
Kohsuke Yatoh
c2008e8aac Add FontManager#updateFontFamily() API.
Bug: 179103383
Test: atest CtsGraphicsTestCases:FontFamilyUpdateRequestTest
Test: atest CtsGraphicsTestCases:FontFileUpdateRequestTest
Test: atest CtsGraphicsTestCases:FontManagerTest
Test: atest FrameworksServicesTests:UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Change-Id: I0103784c72d60567675daf73e95e4d716f091e4a
2021-02-16 07:06:33 -08:00
Benjamin Franz
4c5134f3da Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced am: 8964ef6743
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d349a5f76f496503e328a4fc70e051a2ccca2b6
2021-02-16 13:26:45 +00:00
Benjamin Franz
8964ef6743 Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b38edb7136852c5ecf78e0a4ad0266c77a453a
2021-02-16 12:51:34 +00:00
Benjamin Franz
80bbdfd100 Merge "Add versioning to app compat framework" 2021-02-16 11:48:36 +00:00
TreeHugger Robot
e2d93d3e79 Merge "Check CPU time_in_state from one place" into sc-dev 2021-02-16 11:15:26 +00:00
Galia Peycheva
de2e513209 Merge "Add window background blur public api" into sc-dev 2021-02-15 12:40:02 +00:00
Dmitri Plotnikov
ca9dfbe54e Merge "Convert WakelockPowerCalculator to work with BatteryUsageStats" into sc-dev 2021-02-14 05:08:35 +00:00
Dmitri Plotnikov
d77bb6a44b Merge "Simplify SystemServicePowerCalculator" into sc-dev 2021-02-14 05:08:05 +00:00
Dmitri Plotnikov
248ade5460 Convert WakelockPowerCalculator to work with BatteryUsageStats
Test: atest FrameworksCoreTests:com.android.internal.os.WakelockPowerCalculatorTest

Bug: 158137862
Change-Id: I485bdb1f7dc6622fdf30ddae6d6872f2455f36ad
2021-02-12 13:30:43 -08:00
Manish Singh
2ca39c020f Pass the media capabilities uid when opening media
FileSystemProvider should pass the uid of the calling app by setting
the EXTRA_MEDIA_CAPABILITIES_UID when opening a media, so that
TranscodeHelper can make decision to transcode or not transcode based on
the calling uid, and not based upon the Provider's uid.

BUG=176157500
Test: manual testing.

Change-Id: Ie08b94cf79c86e9f87639e4fbdd82b2732771187
2021-02-12 20:49:02 +00:00
TreeHugger Robot
e33b00efb5 Merge "MeasuredEnergy comment cleanup" into sc-dev 2021-02-12 19:12:57 +00:00
TreeHugger Robot
6516885e88 Merge "Add a new feature to store IncFs version." into sc-dev 2021-02-12 16:37:01 +00:00
Galia Peycheva
792b9eb8dc Add window background blur public api
This CL exposes Window#setBackgroundBlurRadius as public Api. It
creates a region behind the window (with the dimensions of the window
background drawable), which is blurred with the given radius.

It also adds windowBackgroundBlurRadius dimension as an xml attribute
on Window.

Bug: 167166562
Bug: 177524486
Test: m
Test: m doc-comment-check-docs
Test: atest BlurTests
Change-Id: I5c0ff3c7fc7a64e6b2e2339eccc23374ec3b5fd9
2021-02-12 16:17:12 +01:00
Marcin Oczeretko
a4734632f7 Merge changes I327b971f,Ie35e1fe7 into sc-dev
* changes:
  Update AOT trigger names to match the new convention
  Limit PerfettoTrigger to max 1 trigger per minute
2021-02-12 11:07:23 +00:00
Dmitri Plotnikov
d163574738 Simplify SystemServicePowerCalculator
Fix SystemServicePowerCalculatorTest

Test: atest FrameworksCoreTests:com.android.internal.os.SystemServicePowerCalculatorTest
Bug: 158137862

Change-Id: Ia3218b5c91eacfc0122a35d0898bddd8394f8c4e
2021-02-12 00:47:37 -08:00
Hai Zhang
820a6842ed Merge "Revert "Revert "Fix privapp permission allowlisting.""" into sc-dev 2021-02-12 04:16:43 +00:00
Alex Buynytskyy
50bc17cdaa Add a new feature to store IncFs version.
And deprecating the old feature which didn't have versioning support.

V2 means that the new features are either required if the device
was shipped with S, or available if device updated kernel to S.

Bug: 180010901
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: If037f0eb23260f354b0929ff7afaf1af9627e5fa
2021-02-11 19:01:00 -08:00
Adam Bookatz
e98b43242b MeasuredEnergy comment cleanup
Cleans up some:
documentation
comments
dumpsys output

Test: manual
Bug: 174818228
Change-Id: I6b78432ba37a5ba1b00947e2ae9bbaec2349590f
2021-02-11 17:07:22 -08:00
Adam Bookatz
056ea2d70f Merge "CustomMeasuredPowerCalculator" into sc-dev 2021-02-12 00:38:31 +00:00
Connor O'Brien
82cd582c4f Merge "Defer UID data removal until after reading is finished" into sc-dev 2021-02-11 21:42:31 +00:00
Hai Zhang
8d8a003895 Revert "Revert "Fix privapp permission allowlisting.""
This reverts commit e54ab06710.

Reason for revert: Added the missing allowlist entries

Bug: 179996437
Change-Id: Id26f8405468fd62d87c7cb93eabbcee78021bbd8
2021-02-11 20:35:46 +00:00
Ben Lin
761072315a Merge "Revert "Pass ActivityOptions to HeavyWeightSwitcherAcivity."" into sc-dev 2021-02-11 19:29:58 +00:00
Benjamin Franz
360d60d523 Add versioning to app compat framework
With this change, callers can set overrides for specific versions of an
app. The framework falls back to default version when the given version
doesn't have an override set.

Bug: 174043039
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Test: atest PlatformCompatGating
Change-Id: Ib5ff67e752a9c5ee94b6e1dd664d324ab5bf4542
2021-02-11 18:33:45 +00:00
TreeHugger Robot
c8f98396ee Merge "BatteryStats.getCustomMeasuredEnergiesMicroJoules" into sc-dev 2021-02-11 17:42:29 +00:00
Bo Hu
e54ab06710 Revert "Fix privapp permission allowlisting."
This reverts commit e391b19376.

Reason for revert: b/180009384

Test:
lunch sdk_gphone64_x86_64-userdebug
m -j
emulator



Change-Id: I5fb095019804ec732a11bccc9ad6ae43ccbb03b7
2021-02-11 17:20:06 +00:00
Rafal Slawik
4574305a4a Check CPU time_in_state from one place
Move the check whether CPU eBPF tracking is supported to one place to
avoid repeating it in every reader.

Bug: 179485697
Test: existing tests pass
Change-Id: Id6d23614c3d1dde86b66de14bc09f5976f183625
2021-02-11 15:21:13 +00:00
Marcin Oczeretko
794e034d2f Update AOT trigger names to match the new convention
Adding com.android.telemetry namespace prefix to Perfetto trigger names

Test: manual
Bug: 161781469
Change-Id: I327b971fc6415431ba3b6d9aa069cd26d0627761
2021-02-11 10:45:24 +00:00
Marcin Oczeretko
a87fab667c Limit PerfettoTrigger to max 1 trigger per minute
Test: manual
Bug: 161781469
Change-Id: Ie35e1fe7e6a12ab75a60c21f442adcd73372050f
2021-02-11 10:45:11 +00:00
Adam Bookatz
29b15648d1 CustomMeasuredPowerCalculator
Adds a BatterySipper.customMeasuredPowerMah field to account
for custom energy buckets (i.e. EnergyConsumers of type OTHER)
and adds it to the total accumulated battery drain for each uid.

Bug: 179107328
Bug: 174818228
Test: Manual
Change-Id: Iab9c7ff5f410cd7c4be1ce78dfb2c39d4f783418
2021-02-11 00:35:32 -08:00
Adam Bookatz
420a8ca343 Merge "BatteryStats receives custom measured energies" into sc-dev 2021-02-11 08:22:25 +00:00
Fiona Campbell
1a6f0cda46 Merge "Move BrightnessSynchronizer to a display-specific folder." into sc-dev 2021-02-11 07:27:06 +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
Adam Bookatz
da600e0c4a BatteryStats.getCustomMeasuredEnergiesMicroJoules
BatteryStats now has access to the custom measured energies,
in the form of an array of energies, indexed by the custom
energy bucket number (i.e. by the ordinal of each energy
consumer of type OTHER).

Also cleans up unused methods (now that we've solidified this
method as being the one required).

Bug: 179107328
Bug: 174818228

Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: I96d646bd844dfa64d48dbb1158358b7561bae971
2021-02-10 16:05:29 -08:00
Ben Lin
e7ee51e008 Revert "Pass ActivityOptions to HeavyWeightSwitcherAcivity."
This reverts commit 52e7ab8b6f.

Reason for revert: b/179796975, this broke a CTS test

Change-Id: I5e5544dd625b474f7589d2ec32b3eebef9a4487c
2021-02-10 21:16:07 +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
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
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
Connor O'Brien
9451197708 Defer UID data removal until after reading is finished
Removing UID data inside readDelta() callbacks causes deadlocks when
BPF data is used. Instead, build a list of UIDs to remove but defer
deletion until after readDelta() returns.

Bug: 177011744
Change-Id: I38e037b89e71b0cb1ba01374189ba8b7af01d632
Signed-off-by: Connor O'Brien <connoro@google.com>
2021-02-09 18:35:29 -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
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
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
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