Commit Graph

18525 Commits

Author SHA1 Message Date
TreeHugger Robot
b9ded17df0 Merge changes from topic "overlay-config-dumpsys-include-config-file"
* changes:
  Overlay config: include config file data in dumpsys
  Mark ParsedConfiguration.parsedInfo as @Nullable
2022-03-21 08:28:51 +00:00
Tiger Huang
c3813c81a0 Merge "Push drag-resize mode to the client" into tm-dev am: 883190cdb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17222863

Change-Id: Ib2c9262b0229579ebe14f4a5b77986b6efa2045d
2022-03-21 06:08:46 +00:00
Tiger Huang
3e194cc9fa Push drag-resize mode to the client
The goal of this CL is to remove RELAYOUT_RES_DRAG_RESIZING_DOCKED and
RELAYOUT_RES_DRAG_RESIZING_FREEFORM, which is a step to make relayout an
oneway binder call.

When the resize mode is changed at the server side, the server will send
the new mode to the client via IWindow#resized, so the client doesn't
need to obtain the resize mode from the flags returned from relayout.

Bug: 161810301
Test: Perform drag-resize and drag-move on a freeform task and see if
      there is any unexpected behavior.
Change-Id: I450abc113932b6c1dc0ce0e2b76bebdf85a60777
2022-03-20 14:36:19 +08:00
TreeHugger Robot
71f25da1eb Merge "Don't create panel if content is empty" 2022-03-19 11:59:54 +00:00
Kholoud Mohamed
a8e9aa390d Merge changes from topic "apiFeedback" into tm-dev
* changes:
  RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
  RESTRICT AUTOMERGE move device policy resource APIs to a separate class
  RESTRICT AUTOMERGE hide device policy resources constants
2022-03-19 06:30:43 +00:00
TreeHugger Robot
96fd061289 Merge "Track latency for showing the back arrow." into tm-dev am: 9451a7a61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062806

Change-Id: I786cc6a989ebdcb82a1b4c4daaa2552af999fb22
2022-03-19 03:01:46 +00:00
TreeHugger Robot
9451a7a61e Merge "Track latency for showing the back arrow." into tm-dev 2022-03-19 02:44:22 +00:00
kholoud mohamed
b7aedc6f3d RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
2022-03-19 00:22:17 +00:00
David Anderson
652c4bade6 Merge "Add PackageManager feature strings for EROFS." into tm-dev 2022-03-18 17:29:26 +00:00
TreeHugger Robot
1781b4c620 Merge "Send SDK sandbox UID instead of app UID in battery stats push metrics" into tm-dev am: 34fba3edc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17244143

Change-Id: I6d152984de09c76639aa9620ecdb7249eb19f8a8
2022-03-18 17:12:18 +00:00
TreeHugger Robot
34fba3edc7 Merge "Send SDK sandbox UID instead of app UID in battery stats push metrics" into tm-dev 2022-03-18 17:04:25 +00:00
Corina Grigoras
2907ec82ab Merge "Move UiEventLogger interface to modules-utils." into tm-dev 2022-03-18 14:19:43 +00:00
David Anderson
dc362ffcc7 Add PackageManager feature strings for EROFS.
This adds two feature strings for EROFS, one for the legacy staging
version present in 4.19 kernels, and another for the official mainline
version present in later kernels.

Bug: 215725871
Test: manual test
Change-Id: Ic36424b578f985ef5a826c3a89c243720fecd0a6
Signed-off-by: David Anderson <dvander@google.com>
(cherry picked from commit 035cfec7d6)
2022-03-18 04:43:46 +00:00
Marco Gontijo
b4355a326f Send SDK sandbox UID instead of app UID in battery stats push metrics
Bug: 225204467
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I68825c156d67c535978922015f62f2add2ec634d
2022-03-17 22:14:18 +00:00
Richard Gaywood
4305679aad Merge "Implement puller for new SurfaceFlinger dmabuf stats." into tm-dev am: 3e41c83514
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17157091

Change-Id: I84fb71bc6fd5e76b3713b6586891d6d776f2d651
2022-03-17 18:22:14 +00:00
Richard Gaywood
3be5773ec9 Implement puller for new SurfaceFlinger dmabuf stats.
Involves pushing most of the logic down out of StatsPullAtomService
and into KernelAllocationStats.cpp, as well as changing some method
signatures along the way.

At the end of this work, two new fields in atoms.proto will be
populated; these will allow us to tell how much of SurfaceFlinger's
dmabuf memory usage is due to buffers shared with other processes
and how much is due to private internal buffers.

Test: statsd_testdrive 10105
Test: adb shell dmabuf_dump
Bug: 220084049
Change-Id: Ia41cfd693d3db2bd06083801075cae290f67221f
2022-03-17 12:07:09 +00:00
Andrei-Valentin Onea
f3c87b7dfc Merge "Treat allowlists differently for flattened apex" into tm-dev am: c568c0d78e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220110

Change-Id: I2f07cf1b303df82286f5e4df573e9a406777d4c3
2022-03-17 09:57:49 +00:00
Andrei-Valentin Onea
c568c0d78e Merge "Treat allowlists differently for flattened apex" into tm-dev 2022-03-17 09:34:59 +00:00
Mårten Kongstad
fa61d140da Overlay config: include config file data in dumpsys
Overlay packages are configured via one of two mutually exclusive
approaches: either via the overlays' manifests or via XML config files.
The overlay manager dumpsys already includes data for the manifests;
update the output to also include config file data.

The new output includes the raw XML, but to save memory, this is omitted
on user builds.

Example output; note the parsedConfigFile field, and that the parsedInfo
field is null.

  0, ParsedConfiguration{packageName=com.android.overlaytest.framework, enabled=true, mutable=true, policy=vendor, parsedInfo=null, parsedConfigFile=ParsedConfigFile{path=/vendor/overlay/config/config.xml, line=2, xml=<overlay package="com.android.overlaytest.framework" enabled="true" />}}

Bug: 224945112
Test: atest OverlayConfigTest
Test: adb exec-out cmd overlay dump
Change-Id: I1d880d2cc6cff763865b9b445fd2caa7d35c431f
2022-03-17 09:25:54 +00:00
Wu Ahan
8200cd3776 Merge "Mark instrument events of FrameTracker in the trace" into tm-dev am: 332cf2b6d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17077331

Change-Id: I7e4c1d0b0091309420db5c4ca0ffcf1b0af704a1
2022-03-17 02:20:21 +00:00
Wu Ahan
332cf2b6d4 Merge "Mark instrument events of FrameTracker in the trace" into tm-dev 2022-03-17 02:00:24 +00:00
Andrei Onea
fd1c87c0a6 Treat allowlists differently for flattened apex
On devices which use flattened APEX, treat the allowlists as part of the
system image.

Test: m # lunch wembley_2GB-userdebug
Bug: 221862988
Change-Id: I1971a686aa111b396f9e694a74be70d758078423
2022-03-16 18:54:42 +00:00
Corina
cbc4d681e7 Move UiEventLogger interface to modules-utils.
This is so the soures can be accessed both fom framework and modules.
The implementation needs the local StatsLog, so cannot be reused.

Test: m
Test: atest SystemUITests
Test: make statsd_testdrive $ANDROID_HOST_OUT/bin/statsd_testdrive 90
Bug: 218862369
Change-Id: I27ebffa6817575f1377beb80f4092287d9b12c49
Merged-In: I27ebffa6817575f1377beb80f4092287d9b12c49
2022-03-16 18:41:11 +00:00
Corina Grigoras
adf8b23505 Merge "Move UiEventLogger interface to modules-utils." 2022-03-16 18:38:11 +00:00
Corina
6116503243 Move UiEventLogger interface to modules-utils.
This is so the soures can be accessed both fom framework and modules.
The implementation needs the local StatsLog, so cannot be reused.

Test: m
Test: atest SystemUITests
Test: make statsd_testdrive $ANDROID_HOST_OUT/bin/statsd_testdrive 90
Bug: 218862369
Change-Id: I27ebffa6817575f1377beb80f4092287d9b12c49
2022-03-16 18:32:49 +00:00
Michael Wachenschwanz
eb7d253a63 Merge "Fix mobile radio battery consumption double counting" 2022-03-16 17:07:02 +00:00
Wu Ahan
7f57784720 Mark instrument events of FrameTracker in the trace
Mark deferMonitoring/begin/end/cancel/abandon events of FrameTracker.

Bug: 220281996
Test: See trace
Change-Id: I3d3eace0048c523c94311432cb96db8301015c0c
2022-03-16 19:44:02 +08:00
Mårten Kongstad
3bfe1f39a0 Mark ParsedConfiguration.parsedInfo as @Nullable
The ParsedConfiguration.parsedInfo field is marked as @NonNull, but in
case the parsed configuration originated from an overlay config file (as
opposed to the legacy manifest based approach), the field will be null.
Change the field from @NonNull to @Nullable to reflect this.

Bug: N/A
Test: builds
Change-Id: I4119712a65d0f7c6caf2b4810457aeaa05eb2777
2022-03-16 09:59:46 +00:00
David Anderson
ad1f1db512 Merge "Add PackageManager feature strings for EROFS." 2022-03-16 05:02:57 +00:00
Shan Huang
c987d9b846 Track latency for showing the back arrow.
Bug: b/222407451
Test: m -j
Change-Id: Id96af97db97dc3f5648fbfd92aead12b5f62d949
2022-03-16 01:41:18 +00:00
Jared Duke
059b53948f Merge changes from topic "revert-17083643-large-icons-tm-XHQQYXZDHH" into tm-dev am: 7bc013b627
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17199637

Change-Id: I763d2206b91481feb82a5f7fd0872fdaf0f77565
2022-03-16 00:23:49 +00:00
Michael Wachenschwanz
acb52c2fcb Fix mobile radio battery consumption double counting
On ODPM enabled devices, the total mobile radio power consumption was
being used when reporting the idle/suspended power. This means app
mobile radio power consumption was effectively being double counted.

Bug: 209525694
Test: atest MobileRadioPowerCalculatorTest
Change-Id: Ibc1a504014ac10c285b71273ba50493ba237f6a9
2022-03-15 16:22:56 -07:00
Jared Duke
b68458f6cc Revert "Support downscaling of Drawable icons in LocalImageResolver"
Revert submission 17083643-large-icons-tm

Reason for revert: Speculative revert for android.app.cts.NotificationManagerTest breakage.
Reverted Changes:
Ib66933a8f:Size restrict right notification icon size
If3d871e78:Downscale large bitmaps in CachingIconView
I504694cb2:Support downscaling of Drawable icons in LocalImag...

Bug: 224768026
Change-Id: Icae8dfdfb89544f76a43a141b5f93271a03db360
2022-03-15 22:21:10 +00:00
Jared Duke
71cf617ef3 Revert "Downscale large bitmaps in CachingIconView"
Revert submission 17083643-large-icons-tm

Reason for revert: Speculative revert for android.app.cts.NotificationManagerTest breakage.
Reverted Changes:
Ib66933a8f:Size restrict right notification icon size
If3d871e78:Downscale large bitmaps in CachingIconView
I504694cb2:Support downscaling of Drawable icons in LocalImag...

Bug: 224768026
Change-Id: Iabb2d26899979aff25afa095baacd6bae12f6fde
2022-03-15 22:20:51 +00:00
Ahaan Ugale
a727775d80 Merge "Fix ServiceConnector failing unbind if not connected." into tm-dev am: 0ede4b88ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17193618

Change-Id: I219c33cd9a0c01a28c814ae82081287438c9df6b
2022-03-15 20:52:56 +00:00
Ahaan Ugale
52e0dafcb3 Fix ServiceConnector failing unbind if not connected.
ServiceConnector does not call unbindService when requested to unbind if
the service isn't currently connected. This causes issues like leaving
zombie Trusted Hotword processes bound forever if the process is stopped
('restarted') immediately after being created (say if audio server
crashes twice in quick succession).

Fix: 223845998
Test: manual - locally comment out code that immediately connects the
 service, then `for i in {1..10}; do adb shell cmd voiceinteraction\
 restart-detection; done` - without fix results in an extra process
Change-Id: I6a8c01390130bcec9aff1460004343ca2b207031
2022-03-15 08:20:58 +00:00
Jernej Virag
a027bec760 Merge changes from topic "large-icons-tm" into tm-dev am: c515a0aed9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104643

Change-Id: I0bf98385f90d557d4c5752d5f368cf19a6c84658
2022-03-15 07:52:55 +00:00
Jernej Virag
c515a0aed9 Merge changes from topic "large-icons-tm" into tm-dev
* changes:
  Size restrict right notification icon size
  Downscale large bitmaps in CachingIconView
  Support downscaling of Drawable icons in LocalImageResolver
2022-03-15 07:36:11 +00:00
Michael Wachenschwanz
3f53035561 Merge "Smear ModemActivityInfo across multiple stats" into tm-dev 2022-03-15 01:26:33 +00:00
Eric Biggers
e945bd62d6 Merge changes from topic "remove-fde" into tm-dev
* changes:
  Remove unused FDE methods from StorageManager
  Stop checking FDE password cache
  Remove checks for FDE in 'adb backup'
2022-03-14 23:03:22 +00:00
Rob Carr
9f33e09f0a Merge "WMS/ViewRoot: Prepare for Async BLAST Sync [1/N]" into tm-dev am: 6caacdcf72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17100717

Change-Id: Ib978f36892c86f7a5544aefd39a61654fc0ebfd5
2022-03-14 23:03:08 +00:00
Rob Carr
6caacdcf72 Merge "WMS/ViewRoot: Prepare for Async BLAST Sync [1/N]" into tm-dev 2022-03-14 22:48:21 +00:00
Michael Wachenschwanz
be79640cb0 Smear ModemActivityInfo across multiple stats
If ModemActivityInfo is available on a device, smear the provided
transmit and received times across RadioAccessTechnology and frequency
(for NR RAT).

Bug: 207697945
Test: atest BatteryStatsNoteTest
Change-Id: Ifb4e30dc3fa5ac5dd4824a87a7a86c4a0d14d019
(cherry picked from commit e85ac3239e)
2022-03-14 15:16:15 -07:00
Jernej Virag
104e6492b2 Downscale large bitmaps in CachingIconView
CachingIconView is used to displayed (smallish) icons in Notifications. Those can accidentally be made very large if big resources are used.
This makes CachingIconView use LocalImageResolver to load those images with limited size. This fixes large memory use of notification header icons.

Bug: 210690571
Bug: 218845090

Test: Manually on small and large Pixel device with Notification tester APK
      Added Unit Tests to cover this case.
Change-Id: If3d871e788608c1702461d563673560fa18fc53f
2022-03-14 21:51:15 +00:00
Jernej Virag
f450d3c054 Support downscaling of Drawable icons in LocalImageResolver
LocalImageResolver only enforced downscaling for Uri-based Icons at this point. This still allowed app developers to provide large bitmaps as a resource or as a bitmap payload itself. This change also verifies these new types of bitmaps.
Also adds an external size parameter to image resolver so different widgets can use it - right now the upper limit was hardcoded in pixels.

Bug:218845090
Bug:210690571

Test: Manually on device - tested on Raven and new Pixel with multiple
                       notification sizes via notification test apk.
      Unit tests
Change-Id: I504694cb27953bc7950669b1b48f90d2e9c6a68d
2022-03-14 21:51:14 +00:00
Dmitri Plotnikov
e703085f29 Merge "Track CACHED procstate in BatteryStats" into tm-dev am: b79d6441df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17162687

Change-Id: I4152bee2564a95d25910eaabfaa73ac3f550554a
2022-03-14 20:16:23 +00:00
Dmitri Plotnikov
b79d6441df Merge "Track CACHED procstate in BatteryStats" into tm-dev 2022-03-14 19:42:07 +00:00
TreeHugger Robot
0f837c966b Merge "Defer MessagingMessage#recycle until bind ends" into tm-dev am: ec74b17af9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17160577

Change-Id: I6f9c504aa36aa9a99ec6c1fcd657118f659b3c88
2022-03-14 15:35:43 +00:00
TreeHugger Robot
ec74b17af9 Merge "Defer MessagingMessage#recycle until bind ends" into tm-dev 2022-03-14 15:25:15 +00:00
Andrei-Valentin Onea
f0b2f49a87 Merge "Use apex name when querying privapp allowlists" into tm-dev am: ba30e36310
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17155047

Change-Id: I4e645d59a122a26dae577e9b31de2f9283589fa1
2022-03-14 15:15:29 +00:00