Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
629,463 Commits 3 Branches 0 Tags
ec7d92a7356e29dfc148f6161ea075e64c2e808d
Commit Graph

15803 Commits

Author SHA1 Message Date
Connor O'Brien
187fd234ec Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c am: fad30e4c7b am: f35f453e93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I211b83977c23685157713597de2a52fcf999f92d
 2021-03-01 08:22:06 +00:00
Connor O'Brien
f35f453e93 Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c am: fad30e4c7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47f3e39fa42b7eb377f829bd4c1e255cd0f676cb
 2021-03-01 08:17:14 +00:00
Dmitri Plotnikov
2dd963b2ad Merge "Add battery history to BatteryStatsUsage" into sc-dev am: 1a0e70c7bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13702419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e959609767eaf7c9e186925d3abfc61f3c1ae83
 2021-03-01 04:53:28 +00:00
Dmitri Plotnikov
4281d08354 Merge "Break out battery history reading into a separate class" into sc-dev am: cda90b4cf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13636686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2573b6d62aa2b9342df3f690346326d60487d44
 2021-03-01 01:58:07 +00:00
Dmitri Plotnikov
20720fa188 Add battery history to BatteryStatsUsage 
Bug: 173745486
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsProviderTest
Change-Id: Icfd9e49b68f1be99312c88ac889b06aa669367ef
 2021-02-28 17:05:39 -08:00
Dmitri Plotnikov
5ab97fffe0 Break out battery history reading into a separate class 
This class will be used by BatteryUsageStats

Bug: 180765532
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryIteratorTest

Change-Id: Ic392bcdb6eb815afcc3cd882aa32dd4c78b6484f
 2021-02-28 10:34:01 -08:00
Dmitri Plotnikov
155ae26728 Merge "Remove support for OLD_HISTORY" into sc-dev am: 7fa1f6129e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13677957

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0f1c9bd12de9353a0ab790b669656071585fc48
 2021-02-28 06:53:35 +00:00
Dmitri Plotnikov
7fa1f6129e Merge "Remove support for OLD_HISTORY" into sc-dev 2021-02-28 06:01:04 +00:00
Jeff DeCew
09ef67529c Merge changes I57fb542a,If2a13daf into sc-dev am: 6cd5cb738d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13713266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bbd00c8c70184c0818a22d27ebeb4747f584c2b
 2021-02-27 03:57:40 +00:00
Jeff DeCew
6cd5cb738d Merge changes I57fb542a,If2a13daf into sc-dev 
* changes:
  Fix the vertical positioning of the text in collapsed notifications.
  Increase the notification height to 88dp
 2021-02-27 03:08:17 +00:00
Connor O'Brien
fad30e4c7b Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7275e44e3f4cd090cf5c03e25a8b83a8acbbf26
 2021-02-27 01:05:46 +00:00
Connor O'Brien
9267c31a1c Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31e00f5aa8eec8fb3246a375f002820338d4572f
 2021-02-27 00:27:16 +00:00
Connor O'Brien
a0bbd188e4 Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" 2021-02-27 00:04:47 +00:00
Dmitri Plotnikov
3539f8eea2 Remove support for OLD_HISTORY 
The OLD_HISTORY constants has been set to false for almost
ten years. Need to simplify history support in preparation for
including history in BatteryUsageStats.

Bug: 180765532
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryTest
Change-Id: I8b7f55eb6e9e1c896dc046d2e6dafba885bf8970
 2021-02-26 23:14:04 +00:00
Shuo Qian
8b8f2625db Merge changes from topic "cp-rvc-aosp" into sc-dev 
* changes:
  [automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
  Add Emergency callback mode shell command
 2021-02-26 22:56:18 +00:00
Evgenii Stepanov
0ab80262df Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a am: ac811c4025 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4987b360e6ca7d6f60b50c233f60db555c98d1d1
 2021-02-26 21:16:44 +00:00
Evgenii Stepanov
ac811c4025 Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c84f162736af927f6cac041f4200dc3ab2b8efa
 2021-02-26 20:50:30 +00:00
Evgenii Stepanov
d600f5067a Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." 2021-02-26 20:11:10 +00:00
Jeff DeCew
19864ec962 Fix the vertical positioning of the text in collapsed notifications. 
Test: manual / visual
Bug: 181048615
Change-Id: I57fb542a776b254a6537dbed608259e69def411f
 2021-02-26 14:19:00 -05:00
Hans Boehm
a15cde59cc Merge "Add zygote native fork loop" am: 43a9a8089f am: dd81ed70c7 am: 925ecc3f80 am: 1d550ecd10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia212ba95b161d9df0257c3cefab8dd12dacc3e26
 2021-02-26 17:35:42 +00:00
Todd Kennedy
e8f95cc1e5 Merge "Add self to owners for SystemConfig.java" am: 4b6dcc5192 am: 0e7a0c7ba9 am: 9a03d6f19e am: 5f9160b6cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6604bfc8f1ea2c6b9710459b615158b28a8b0d79
 2021-02-26 17:35:27 +00:00
Adam Bookatz
85e74cc4e1 Merge "TEST_MAPPING for BatteryStats" into sc-dev am: 47fe2c6ade 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd3867d363fe0c70543886fd175ffe72a0cf9d72
 2021-02-26 17:34:33 +00:00
Hans Boehm
1d550ecd10 Merge "Add zygote native fork loop" am: 43a9a8089f am: dd81ed70c7 am: 925ecc3f80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3afb617aab80b073b56fa0c61398ae6d42800a75
 2021-02-26 17:20:42 +00:00
Todd Kennedy
5f9160b6cf Merge "Add self to owners for SystemConfig.java" am: 4b6dcc5192 am: 0e7a0c7ba9 am: 9a03d6f19e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43f7e957d5c50d1762dbc2473eb0380b1ac168e3
 2021-02-26 17:20:16 +00:00
Adam Bookatz
47fe2c6ade Merge "TEST_MAPPING for BatteryStats" into sc-dev 2021-02-26 17:11:40 +00:00
Galia Peycheva
525c824506 Merge "Fix synchronisation in BackgroundBlurDrawable" into sc-dev am: 656d774184 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518706

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib53b4a5f5972a3e2ac6cc6286a2f30f316bda745
 2021-02-26 14:53:11 +00:00
Galia Peycheva
656d774184 Merge "Fix synchronisation in BackgroundBlurDrawable" into sc-dev 2021-02-26 14:30:04 +00:00
Jeff Sharkey
2092a02d7e Merge "Add OWNERS for long screenshots framework code" am: 79bed70aa2 am: 4df29fd76a am: 2b3fee42d8 am: 869d848e45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9df1ccd58f0c94de16a8972d0bd4cf511f182572
 2021-02-26 13:21:35 +00:00
Mark Renouf
1036ee23b2 Merge "Long screenshots framework update and API unhide" into sc-dev am: 20bd3d4935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic631f8c1d77c92d590865783881f2de61bad6566
 2021-02-26 13:19:38 +00:00
Jeff Sharkey
869d848e45 Merge "Add OWNERS for long screenshots framework code" am: 79bed70aa2 am: 4df29fd76a am: 2b3fee42d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb05293712e0b6127bda0e8e297e447956ee5aa1
 2021-02-26 13:08:55 +00:00
Mark Renouf
20bd3d4935 Merge "Long screenshots framework update and API unhide" into sc-dev 2021-02-26 13:06:47 +00:00
Zoey Chen
4d942da6f9 Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c am: ce04917626 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia03b7e2c3c1e7aec5835d46932790d0708cdcc81
 2021-02-26 10:06:39 +00:00
Zoey Chen
ce04917626 Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac56b19c16cfa22f833fdff5cac79002f1030e06
 2021-02-26 09:47:40 +00:00
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
Evgenii Stepanov
15cce113f7 Implement memtagMode and nativeHeapZeroInit manifest attrs. 
memtagMode allows an app to opt in to MTE in either sync or async mode.

nativeHeapZeroInit enables automatic initialization of heap memory.

Both attributes default to off and can be specified at either
application or process level.

Bug: 135772972
Bug: 177438394
Bug: 178038272
Test: CtsTaggingHostTestCases

Change-Id: I6a481a9d2363997bf954f248d08224c79f0c2afb
Merged-In: I6a481a9d2363997bf954f248d08224c79f0c2afb
 2021-02-25 23:38:33 +00:00
Mark Renouf
8f1b73e183 Long screenshots framework update and API unhide 
This change includes a series of API review changes. The most
significant update is the addition of cancellation signals to
API methods where needed.

Renames some internal classes and interfaces to support the
API changes and to simplify tests and improve quality.

Test: numerous presubmits
Bug: 175830670
CTS-Coverage-Bug: 180419562
Change-Id: I9b1b950a2779fc902ecf4d6394e3c35171926700
 2021-02-25 23:02:17 +00:00
Adam Bookatz
b62859528e TEST_MAPPING for BatteryStats 
Creates presubmit test mapping for BatteryStats-related
files.

These tests can be run manually via
atest FrameworksServicesTests:com.android.server.am.BatteryExternalStatsWorkerTest FrameworksServicesTests:com.android.server.am.MeasuredEnergySnapshotTest FrameworksServicesTests:com.android.server.am.BatteryStatsServiceTest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests

Tests that currently fail are marked to be skipped;
they should be addressed by b/180015146.
This is accomplished by introducing a new annotation, @SkipPresubmit.

Test: treehugger presubmit
Bug: 180016384
Change-Id: If01beaa342468aeded660e5766a14391d3ee9bcc
 2021-02-25 14:51:01 -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
Galia Peycheva
d129f1e00e Fix synchronisation in BackgroundBlurDrawable 
The PositionUpdateListener in BackgroundBlurDrawable is called from
a thread pool to update the position of the BlurRegion. After that,
in frame drawing callback (RenderThread), the Aggregator takes all
the settings in BackgroundBlurDrawable and dispatches them to SF.
However, while the RenderThread is working on frame N, the Ui thread
is working on frame N+1. So when the frame drawing callback is
called on RenderThread for frame N, BackgroundBlurDrawable
might already be holding settings for frame N+1.

In this CL, we fix that by making BackgroundBlurDrawable work only on Ui
thread, while BlurRegion lives only on RenderThread. Just before
drawing, we copy the state of BackgroundBlurDrawable into a BlurRegion.
So when render thread starts doing its thing for frame N, Ui thread can
start setting up BackgroundBlurDrawable for frame N+1. The settings for
frame N are already copied over to BlurRegion. In frame drawing
callback, we take the blur regions if there is a pending update and send
them to SF.

Bug: 167166562
Test: m && atest BlurAggregatorTest
Change-Id: Icec0fa8e97de30b7bad15b97f848ae642076652f
 2021-02-25 18:33:33 +01: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