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

9010 Commits

Author SHA1 Message Date
Zimuzo Ezeozue
4005dd8a79 resolve merge conflicts of 7df4e1c5a4 
resolve merge conflicts of
"Add API to notify the system_server when app is blocked on I/O"
to master

Change-Id: Ie7a7be2a5b8557a2cdd3fbc1a6a37622b29535be
 2021-03-01 15:55:14 +00:00
Zim
c534503ac0 Add API to notify the system_server when app is blocked on I/O 
The MediaProvider is also the ExternalStorageService and manages all
app I/O on external storage. While handling an apps request, the MP
might block on some long running computations e.g transcoding

Test: Manual
Bug: 170486601
CTS-Coverage-Bug: 181222557

Change-Id: I36b59eb84d8de6b73ed22e82df1093e946e53eab
 2021-03-01 10:36:16 +00:00
Saumya Pathak
8a58346728 Merge "Adding API to get PendingIntent to launch manageSpaceActivity" 2021-03-01 10:36:04 +00:00
Hunter Knepshield
02dc43dae6 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78 am: 0f5e18a9f0 am: 0da42ef255 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If46cdd9a4003879ef18a35c073a1fddbafa50a3c
 2021-03-01 08:18:34 +00:00
Almaz Mingaleev
6757cc9319 Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 am: 08f03dc59c am: 4d562f64fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5563c85e42d537a9e972f6a5f30355a010ebbc5e
 2021-03-01 08:15:15 +00:00
Hunter Knepshield
0da42ef255 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78 am: 0f5e18a9f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09da5ada79dc0417e9f40769b924d1834fed3250
 2021-03-01 08:12:58 +00:00
Almaz Mingaleev
4d562f64fd Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 am: 08f03dc59c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5c9d8adbe377432df0710d8ab473683f6866bd7
 2021-03-01 08:08:35 +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
Felipe Leme
8ca16eb512 Merge "Minor adjustements on UserManager.isUserForeground()." into sc-dev am: c3459a6e4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13607427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e44d7f38fcda8b798616c472c3881381b8906d0
 2021-03-01 04:52:49 +00:00
Dmitri Plotnikov
1a0e70c7bd Merge "Add battery history to BatteryStatsUsage" into sc-dev 2021-03-01 04:45:20 +00:00
Felipe Leme
c3459a6e4e Merge "Minor adjustements on UserManager.isUserForeground()." into sc-dev 2021-03-01 03:52:48 +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
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
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
Hunter Knepshield
0f5e18a9f0 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71f11a4a2ecec595a428f611d5bf62181a5e18d4
 2021-02-26 19:12:00 +00:00
Hunter Knepshield
b79c80ba78 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0c2b746e1be4944a6caa05c6764f37cf960bace
 2021-02-26 18:52:56 +00:00
Hunter Knepshield
39742a519c Merge "[API review] Additional detail in BugreportCallback javadoc." 2021-02-26 18:31:22 +00: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
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
Adam Bookatz
47fe2c6ade Merge "TEST_MAPPING for BatteryStats" into sc-dev 2021-02-26 17:11:40 +00:00
Kholoud Mohamed
0215a5bfdc Merge "Exposed some testAPIs in UserManager" into sc-dev am: b3d381a109 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I295b60fe5ec071a7e79297c643a78f203342b546
 2021-02-26 13:00:22 +00:00
Kholoud Mohamed
afb12625a9 Exposed some testAPIs in UserManager 
The following changes in UserManager are required for ongoing
improvements to CTS/GTS infrastructure.
- Exposed the following as testAPIs:
	* isGuestUserEphemeral
	* createUser
	* preCreateUser
	* createProfileForUser
	* createRestrictedProfile
	* getUsers
	* getUserType
- Added permissions to the following APIs:
	* CREATE_USERS for getUserName
	* INTERACT_ACROSS_USERS for getProfileParent
- Added CREATE_USERS permission to the documentation of
getUsers and the APIs that call it.

Test: Confirmed that a CTS test can call these APIs
Bug: 178695365
Change-Id: Id9105db3bfefb926139715b728acedefd2a5ca3e
 2021-02-26 10:08:18 +00:00
Almaz Mingaleev
08f03dc59c Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25dc972b3303e1950eb8a7192852876e2e1fad5b
 2021-02-26 10:05:16 +00:00
Almaz Mingaleev
c76d1a4c26 Merge "Re-throw system server exception." am: 112cd8df86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39697856d7fee18200e7405d84a45add58d60921
 2021-02-26 09:19:15 +00:00
Almaz Mingaleev
112cd8df86 Merge "Re-throw system server exception." 2021-02-26 08:42:36 +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
Felipe Leme
0c2d8b897e Minor adjustements on UserManager.isUserForeground(). 
- Uses context user id instead of calling user id.
- Annotated with @UserHandleAware.
- Updated javadoc.

Test: m update-apis
Test: atest CtsMultiUserTestCases
Bug: 173541467

Change-Id: Id61fb73f2b7313265554cff9f496eb118a7e6a1e
 2021-02-25 17:58:14 -08:00
Rupert Lane
cfd021a5ee Merge "Rename Build.IS_CONTAINER to IS_ARC" 2021-02-26 00:16:28 +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
Hunter Knepshield
433d357604 [API review] Additional detail in BugreportCallback javadoc. 
This covers edge cases left out of the previous generalization.

Bug: 180015324
Test: make
Change-Id: I309d17cd09434469b5d88275cd59e864f4830c3a
 2021-02-25 23:16:20 +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
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
Saumya Pathak
5239aa140a Adding API to get PendingIntent to launch manageSpaceActivity 
Bug: 167966131
Test: StorageTestApp and atest StorageManagerTest#testLaunchManageSpaceActivityIntent
Change-Id: Id3d23fcca992819238cd24fc441c98719d5e7709
 2021-02-25 15:17:52 +00:00
Almaz Mingaleev
b0d08720dc Re-throw system server exception. 
Previous "return 0" was not reachable, this makes intention
cleaner.

Bug: minor cleanup
Test: TH only
Change-Id: I50d7d1a2ed53b8f8fe245c6ac6aad4fb8b4ce6e3
 2021-02-25 15:13:26 +00:00
Charles Chen
ff2cf5155c Merge "Unhide isUiContext()" into sc-dev am: f225921153 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13636799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2569a3d0e1465853b637d4ecc16200d9afc8eb19
 2021-02-25 14:37:14 +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
Charles Chen
f225921153 Merge "Unhide isUiContext()" into sc-dev 2021-02-25 04:05:49 +00:00
Rupert Lane
45ad354f50 Rename Build.IS_CONTAINER to IS_ARC 
As ARC is moving from a container to a VM based solution, change the
build method to detect this.

Bug: 139490365
Test: Check that VM works after pushing to device: run play store,
install app.

Change-Id: Ic91a7e5c9a36242d2c905cecffeec72acba8ff45
(cherry picked from commit 2f78de6d0e1428d959f97ea0dd0e3c9c28b6e3fb)
 2021-02-25 02:32:43 +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
Hans Boehm
925ecc3f80 Merge "Add zygote native fork loop" am: 43a9a8089f am: dd81ed70c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11e1abaa50306262ec5b2a19d95b481ef64987cc
 2021-02-25 01:14:50 +00:00
Hans Boehm
dd81ed70c7 Merge "Add zygote native fork loop" am: 43a9a8089f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92e404bd6ce19df88d832127f738ec8c6305fe74
 2021-02-25 00:30:09 +00:00
Hans Boehm
43a9a8089f Merge "Add zygote native fork loop" 2021-02-25 00:02:19 +00:00
Treehugger Robot
a60b71817f Merge "BugreportManager API review updates." am: e0db8b998f am: c8e42d59e7 am: 94a089b673 am: feed10cb15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia732a5c8ebf12e8d138df55e960abfebb6b092b0
 2021-02-24 00:43:23 +00:00
Tianjie Xu
b03e458835 Merge "Throw an exception in RoR api on no-pin case" am: 7444774737 am: 4d208ac97e am: c26952bf52 am: fd08d9eac5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I700f72a41e9f257e19bd63396f161a0ff832c482
 2021-02-24 00:42:56 +00:00
Treehugger Robot
feed10cb15 Merge "BugreportManager API review updates." am: e0db8b998f am: c8e42d59e7 am: 94a089b673 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If29af220ff4d636b5870a16b14ead953e562aa70
 2021-02-24 00:20:46 +00:00
Tianjie Xu
fd08d9eac5 Merge "Throw an exception in RoR api on no-pin case" am: 7444774737 am: 4d208ac97e am: c26952bf52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65d8cb00ee0c08763a53714f8825bc4d8a75557e
 2021-02-24 00:19:46 +00:00
Treehugger Robot
94a089b673 Merge "BugreportManager API review updates." am: e0db8b998f am: c8e42d59e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibba20423d6d2d3a5394d871f5f4f2d33d0afdceb
 2021-02-24 00:14:10 +00:00