Songchun Fan
5b7742b554
Merge "[pm/incremental] minor fix for unbind timing" into sc-dev am: d011cf614e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13733813
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd597a636da8a3db1a9fbc8c186d2eefa41646fd
2021-03-02 23:12:55 +00:00
TreeHugger Robot
ad727a3c91
Merge "Add return value annotation to getSoundTriggerMode" into sc-dev am: ad44b3ceaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13738379
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If29da4cbb44db2c44b2d9b23fe7c7faefb2cbe9a
2021-03-02 23:06:45 +00:00
Songchun Fan
d011cf614e
Merge "[pm/incremental] minor fix for unbind timing" into sc-dev
2021-03-02 22:55:06 +00:00
TreeHugger Robot
ad44b3ceaa
Merge "Add return value annotation to getSoundTriggerMode" into sc-dev
2021-03-02 21:59:09 +00:00
Remi NGUYEN VAN
b95df8fcfb
Merge "Move UidRange to connectivity" am: 5a81037576 am: 4f6f17230f am: 6dd910c726 am: 3f5702c5ef
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7af4a463b6caf290f9d1a07d12dc345bc42b61ab
2021-03-02 21:31:21 +00:00
Remi NGUYEN VAN
3f5702c5ef
Merge "Move UidRange to connectivity" am: 5a81037576 am: 4f6f17230f am: 6dd910c726
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3
2021-03-02 21:09:32 +00:00
Remi NGUYEN VAN
6dd910c726
Merge "Move UidRange to connectivity" am: 5a81037576 am: 4f6f17230f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic05c10eca12c3c43190c767b4cef6ad88a0835f5
2021-03-02 20:43:46 +00:00
Remi NGUYEN VAN
4f6f17230f
Merge "Move UidRange to connectivity" am: 5a81037576
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I672615b0804b9a9de4befa1ba5aea2efb9c962df
2021-03-02 20:24:20 +00:00
Chiachang Wang
03135bd3da
Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6 am: 089104cf50 am: 9ec3eb7802
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69fca81294374e383ccca363b2ec490bae0b2525
2021-03-02 20:10:36 +00:00
Songchun Fan
825e6a7fef
[pm/incremental] minor fix for unbind timing
...
Do not unbind stage dir after rename. IncrementalFileStorages.cleanUp() will take
care of that. Otherwise, we lose the chance to unregister the loading
progress listener.
BUG: 181610887
Test: manual
Change-Id: I690609ffeac25b07fd8fe6fd4fdfe44148325523
2021-03-02 20:02:25 +00:00
Chiachang Wang
9ec3eb7802
Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6 am: 089104cf50
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I695ba5ac549800fbf87a8c2a53e1eab86e91d2c3
2021-03-02 19:55:22 +00:00
Chiachang Wang
089104cf50
Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib734109b5f2e6acb26e25e65139890415dfb0bc2
2021-03-02 19:50:50 +00:00
Chiachang Wang
fed4ec6ff6
Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23cce279f53babac5b90364dd4fc0e55eb382dfa
2021-03-02 19:22:34 +00:00
Nicholas Ambur
22816ac3e7
Add return value annotation to getSoundTriggerMode
...
Bug: 181064773
Test: build and manually verify SoundTrigger
Change-Id: I75929c9fc0747e4df9dc385b580dff844b4a7b8c
2021-03-02 11:12:49 -08:00
Abhijeet Kaur
d41a537ed0
Merge "Removed unused mount mode constants" into rvc-qpr-dev-plus-aosp
2021-03-02 13:54:01 +00:00
Remi NGUYEN VAN
5a81037576
Merge "Move UidRange to connectivity"
2021-03-02 09:27:50 +00:00
Remi NGUYEN VAN
c983440dd8
Move UidRange to connectivity
...
UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.
Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.
Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
2021-03-02 15:35:36 +09:00
Chiachang Wang
0d7553b30e
Merge changes Ifc561b6d,I63137b24
...
* changes:
Remove RouteInfo hidden depdendency in NMS
Remove the hidden ConnectivityManager dependency in NMS
2021-03-02 05:13:22 +00:00
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