Commit Graph

8571 Commits

Author SHA1 Message Date
TreeHugger Robot
b1e041d5b5 Merge "Support multi-channel FF vibration effect for input device." 2020-12-08 23:33:24 +00:00
Jeff Sharkey
0ab7007631 resolve merge conflicts of 358f0d4fc8 to master
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
2020-12-08 11:01:05 -07:00
Jeff Sharkey
358f0d4fc8 Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2776a545a24f007ccb4b9ee14705978571265ef3
2020-12-08 16:43:19 +00:00
Jeff Sharkey
24d251403b Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c am: c7c4a74a78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5120a3701af3564f363900b20bca75f3ad2a854c
2020-12-08 16:43:17 +00:00
Jeff Sharkey
9af6ac78b0 Merge changes from topic "dec5" am: c2793cf12b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdc390f5ae046c515a30158f3f55b831be147547
2020-12-08 16:05:11 +00:00
Jeff Sharkey
c7c4a74a78 Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0211462ecbcd9ad66f66af87e31cf12e1582fc65
2020-12-08 16:01:16 +00:00
Jeff Sharkey
c2793cf12b Merge changes from topic "dec5"
* changes:
  Improve OWNERS coverage across frameworks/base/.
  Improve OWNERS coverage across frameworks/base/.
  Improve OWNERS coverage across frameworks/base/.
2020-12-08 15:39:59 +00:00
Jeff Sharkey
52b9862f87 Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script that
identifies relevant "include" directives.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
2020-12-08 08:36:28 -07:00
Jeff Sharkey
fab0ab3c9c Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script from
detailed ownership information confirmed by team leads.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I9789c97c1de8e5d962b48c29c57d82fe83729eba
Change-Id: I9789c97c1de8e5d962b48c29c57d82fe83729eba
2020-12-08 08:36:27 -07:00
Adam Bookatz
cd28137020 Merge "Generic Test profile on debuggable builds" 2020-12-07 23:13:29 +00:00
Treehugger Robot
f4f42950c9 Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da am: c661b70d60 am: 848458fae1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503133

Change-Id: I8df231d1a87fa0ddd63b609cf42834b24b7177e6
2020-12-07 21:02:20 +00:00
Adam Bookatz
cb01739074 Generic Test profile on debuggable builds
We introduce a new profile type for testing purposes.
It can be used for testing non-managed profiles, which
currently only have partial support.
It is only available on debuggable (userdebug/eng).

Bug: 170249807
Test: manual (adb shell pm create-user --user-type android.os.usertype.profile.TEST Name)
Change-Id: I37f593bbcaa9059f3afdc8668c2065bc623aa125
2020-12-07 09:41:41 -08:00
Anton Hansson
60fc6b2406 Merge "Add VERSION_CODES constant for S" am: dfe33cb756 am: 230a340757
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513731

Change-Id: I3ead6dc8599c4327b15138de931bd3c8392f8953
2020-12-07 17:33:37 +00:00
Anton Hansson
230a340757 Merge "Add VERSION_CODES constant for S" am: dfe33cb756
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513731

Change-Id: Ib41868f0c19d300fbbf0f5cc3cbf922ef4ece5b8
2020-12-07 14:48:36 +00:00
Anton Hansson
dfe33cb756 Merge "Add VERSION_CODES constant for S" 2020-12-07 14:12:20 +00:00
Treehugger Robot
848458fae1 Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da am: c661b70d60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503133

Change-Id: I9cab7d61cfe9fcf6e551b6c225bd36fd222b1753
2020-12-07 08:22:22 +00:00
Treehugger Robot
c661b70d60 Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503133

Change-Id: If26fbc900b82beeab1f68d6e68c7eb1903ee9db9
2020-12-07 08:13:58 +00:00
Treehugger Robot
294dd8f1da Merge "Throw BadParcelableException from set/getParcelable" 2020-12-07 07:32:29 +00:00
Manish Singh
3b8d8bc781 Introduce new preference indicating user control.
If the user enables this, then that means that we will respect user's
choices for all the preferences, i.e. we will not update the preferences
based on the updates from server.
On the other hand, if it's disabled, then the rest of the preferences
would not be considered.  And we'd decide their values based on the
values from the DeviceConfig (which in turn come from the server).

Also, renaming the set prop key for enabling-transcode to match the one
in DeviceConfig - transcode_enabled.

Also, the "transcode_enable_all" controller now enables (instead of
disabling) the global level transcoding.

BUG:169327180

Test: manual testing.

Change-Id: I183b3b5496b647943be377c02c8c9e2a0df71752
2020-12-06 23:37:15 +00:00
TreeHugger Robot
b7cee931e2 Merge "Add SystemMemory pulled atom in statsd" 2020-12-04 22:05:46 +00:00
Dmitri Plotnikov
75affe2132 Merge "Introduce BatteryUsageStats API" 2020-12-04 00:00:46 +00:00
Dmitri Plotnikov
bfe822007b Introduce BatteryUsageStats API
Bug: 158137862
Test: Start Settings app, navigate to Apps, pick an app, navigate to Battery

Change-Id: I8da8cc9501e01282b855f1bee6032911d91aaf77
2020-12-03 10:42:41 -08:00
Ioannis Ilkos
83b88de75e Add SystemMemory pulled atom in statsd
Initial implementation of kernel-level memory metrics

Bug: 149462065
Bug: 172201884
Test: statsd_testdrive
Change-Id: I9c0e24f2771ce398942845af6934f0cbc64044c0
2020-12-03 13:54:53 +00:00
Xin Li
9e27e114af Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master 2020-12-03 03:18:49 +00:00
Treehugger Robot
61f71c3d88 Merge "Update comment for new proto directory" am: 777d7d838a am: 9f5b01e691 am: 1592b52b91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513316

Change-Id: Iee4145492ba8f6821b1e0ddeb97e6205e778fd1a
2020-12-02 15:25:42 +00:00
Treehugger Robot
1592b52b91 Merge "Update comment for new proto directory" am: 777d7d838a am: 9f5b01e691
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513316

Change-Id: I6123688f943713d9baf1d98ebbe59ae86f6d6426
2020-12-02 14:29:42 +00:00
Treehugger Robot
777d7d838a Merge "Update comment for new proto directory" 2020-12-02 13:08:47 +00:00
Xin Li
d31ee38811 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
2020-12-02 00:38:58 -08:00
Treehugger Robot
70edf54d81 Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" am: c0b44fca8b am: bd2f82c88c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406256

Change-Id: I44114ea2abcba197c8614c1e93db8b28faf16afe
2020-12-01 18:07:01 +00:00
Treehugger Robot
c0b44fca8b Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" 2020-12-01 16:52:45 +00:00
Zimuzo Ezeozue
46e59fe8b3 Merge "Fixed a race contidion in StorageManagerService" am: 782ef476df am: c6536c8794 am: 93a82398b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508499

Change-Id: If6b1b4d78b28e70e7739726e70089d485c15f7c4
2020-12-01 11:55:33 +00:00
Zimuzo Ezeozue
93a82398b0 Merge "Fixed a race contidion in StorageManagerService" am: 782ef476df am: c6536c8794
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508499

Change-Id: Ia52c056e856950dcad38187fb78243ebc728a8cc
2020-12-01 11:42:48 +00:00
Zimuzo Ezeozue
782ef476df Merge "Fixed a race contidion in StorageManagerService" 2020-12-01 10:52:23 +00:00
Felipe Leme
b0402e7bf3 Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()
The existing method is confusing (the argument used to be called
includeDying) and it puts the burden on the caller (which need to
understand what the parameter means).

Furthermore:

- The majority of calls are for getUsers(excludeDying=true).
- The calls for getUsers(excludeDying=false) are equivalent to
  calls to getUsers()

Test: m
Test: a VpnTest ConnectivityServiceTest PermissionMonitorTest

Bug: 157921703
Change-Id: Ife767a40b7b7790ba28b5377046de822ddbf275c
Merged-In: Ife767a40b7b7790ba28b5377046de822ddbf275c
(cherry picked from commit 6dc6d2b964)
2020-12-01 15:25:52 +08:00
Lais Andrade
9c3ddc9cbd Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5 am: d95f42a4ee am: 8c54f99eba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513870

Change-Id: I8f5eb7cbf2aca09f05d8c29f674058a3c510c91f
2020-12-01 01:18:47 +00:00
Lais Andrade
8c54f99eba Merge "Fix documentation of delay param in VibrationEffect.Composition" am: 040919bef5 am: d95f42a4ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513870

Change-Id: Ia7dfebf9187054eccb3ca9a2309a94ac674995f7
2020-12-01 01:02:24 +00:00
Zimuzo Ezeozue
d8c36b5888 Merge "Remove dead isolated storage code from StorageManagerService" 2020-11-30 20:55:29 +00:00
Jeffrey Huang
ca10c36424 Update comment for new proto directory
Bug: 167962588
Test: m -j
Change-Id: I539212aa9f5fd86d58116e32abbe48190dd3ca16
2020-11-30 12:44:45 -08:00
Lais Andrade
cc8210d370 Fix documentation of delay param in VibrationEffect.Composition
Change-Id: I9aca87e8d804d39ad61b651cc7653c8ef57e13e3
Fix: 150715908
Test: N/A
2020-11-30 16:46:18 +00:00
Anton Hansson
b755b613ed Add VERSION_CODES constant for S
This is a subset of the commit ed460aa186
from internal master.

Note: The CL used for the Merged-in tag is irrelevant to this change but
achieves the desired automerging effects.

Test: No
Merged-In: If5c3b92063b8d9fb3f9b6272eb2cfef448065380
Change-Id: I205766a281eb3956c3d122f5358fe5c984803e6e
2020-11-30 16:14:29 +00:00
Olof Axelsson
ed2716dd24 Fixed a race contidion in StorageManagerService
StorageManagerService#onVolumeStateChanged passes on a mutable
object to onVolumeStateChangedLocked and onVolumeStateChangedAsync.
This causes a race since the state of the object being passed can
be updated while onVolumeStateChangedAsync is processing it.

To fix this, a clone of the object is passed instead.

Bug: 174056195
Test: atest AdoptableHostTest
Test: atest com.android.tests.fused.host.FuseDaemonHostTest
Change-Id: I4de32279ae740544bd3abe33d788ebdbef1eab00
2020-11-30 15:45:43 +00:00
Chris Ye
28f00f879e Support multi-channel FF vibration effect for input device.
Support multi-channel FF vibration effect with CombinedVibration effect
API.

Bug: 161629089
Test: atest InputDeviceVibratorTest
Change-Id: Ie1bd82a324501704cfc673c7cea8af6aae974407
2020-11-27 18:41:24 +00:00
Zim
7ac598f2ad Remove dead isolated storage code from StorageManagerService
Isolated storage was added in Q (and enabled by default) and has been
replaced by FUSE in R

Additionally, we can remove the ExternalStorageMountPolicy concept
which is only required if isolated storage is false

Cleanup in preparation to introduce DeviceConfig changes for
transcoding

Bug: 169327180
Test: Builds
Change-Id: Ie2686d8efa6654ea6c4b4ca8c121c0c1841a6356
2020-11-27 09:45:50 +00:00
Treehugger Robot
8d840085e4 Merge "ParcelableHolder shouldn't write anything for empty case" am: 97c2606bbd am: a539a7a3b2 am: 594ccb4851
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1509888

Change-Id: I1dde6fb17cb43885eaefe97fbd9ca1c8c965973b
2020-11-26 03:34:03 +00:00
Treehugger Robot
594ccb4851 Merge "ParcelableHolder shouldn't write anything for empty case" am: 97c2606bbd am: a539a7a3b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1509888

Change-Id: I1cb4b8601947e050c4186d485c161addfd3a640c
2020-11-26 03:33:35 +00:00
Jeongik Cha
3f5ffa615a ParcelableHolder shouldn't write anything for empty case
If neither Parcel nor Parcelable exists, ParcelableHolder'd better
write nothing like NDK and C++ backend.

In the case of empty ParcelableHolder
As-is(Java):
 4 -> Size
 -1 -> Existence(empty string)

To-be(NDK, C++ now):
 0 -> Size

Test: atest CtsNdkBinderTestCases
Bug: 173682663
Change-Id: I816108fdc59170ea7408f0633295ba978f1ef9d5
2020-11-24 22:44:42 +09:00
Michael Wachenschwanz
26acf27957 Merge changes I9b91ed27,Ia77d0eac,I014c2ee9
* changes:
  Fix PowerStatsView AppPicker activity start
  Utilize Measured Energy data in PowerStatsViewer
  Introduce MeasuredEnergyStats to BatteryStatsImpl
2020-11-23 17:38:05 +00:00
Jeongik Cha
eaf5d14c1e Throw BadParcelableException from set/getParcelable
As-is: It returns false or null, so it could fail silently.
To-be: In exceptional cases, it throws Runtime exception

Test: atest aidl_integration_test
Bug: 171982001
Change-Id: Ia5902bc2d35d7e72b5f014722453b6d9e313f1ed
2020-11-23 19:42:43 +09:00
Treehugger Robot
579a490a1b Merge "Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag." am: 00326a8902 am: 935bacec4a am: 048727199b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503394

Change-Id: I1004128862e64979395bd79b66f36b085ef5d030
2020-11-21 02:04:44 +00:00
Treehugger Robot
048727199b Merge "Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag." am: 00326a8902 am: 935bacec4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503394

Change-Id: I43a09e2c3fbaa93b700b7e028aecf2b5a20e74bd
2020-11-21 01:28:59 +00:00