Commit Graph

8168 Commits

Author SHA1 Message Date
Jeff Sharkey
845bfdd0ba Merge "Additional per-file OWNERS for shared directories." am: 8b102a5988 am: 7a9f3e10de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9df0f96893728df43b3ae402ac69ec3e02079f51
2020-12-10 16:32:34 +00:00
Jeff Sharkey
e2cc3f8bec Additional per-file OWNERS for shared directories.
Iteration based on areas of tree where detailed ownership was found
to be missing during routine code reviews.

Also add more detailed examples to OWNERS.md.

Bug: 174932174
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I46ccef33b34594181ae8dc62973d68020f827d6b
2020-12-10 08:37:23 -07:00
Dmitri Plotnikov
0ad8cb5966 Merge "Add per-file OWNERS for BatteryStats" am: cac4499628 am: d8a9268460
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74d7cc2d030f7a6e78d8c7e9903a48e93301c5c3
2020-12-09 03:26:47 +00:00
Dmitri Plotnikov
d8a9268460 Merge "Add per-file OWNERS for BatteryStats" am: cac4499628
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d258d326af6662a7e8d1dcaa1bbbeffdc19da94
2020-12-09 03:06:09 +00:00
Dmitri Plotnikov
c5afcc503b Add per-file OWNERS for BatteryStats
Test: N/A

Change-Id: Ie9eef7eed7f097113074c3c5f3f7a7084a55f97b
2020-12-08 16:38:23 -08: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
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
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
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
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
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
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
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
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
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
Treehugger Robot
00326a8902 Merge "Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag." 2020-11-21 00:42:47 +00:00
Chiachang Wang
debe20edd7 Merge changes from topic "move_BSCH" am: 1b414d61b4 am: 2ea9048daa am: 7becf08476
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503395

Change-Id: I09068be6ac4d220c3e9e9242f3e0eb2cf5d01e23
2020-11-20 09:04:31 +00:00
Chiachang Wang
61199f587e Move BasicShellCommandHandler to frameworks/lib/modules-utils am: d5726c1916 am: d3e4d83eb7 am: b6f524b2df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483965

Change-Id: Ib09544e292d472e8dcd7dcf218035a0ec6de293c
2020-11-20 09:04:26 +00:00
Chiachang Wang
7becf08476 Merge changes from topic "move_BSCH" am: 1b414d61b4 am: 2ea9048daa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503395

Change-Id: I3c14ab887a0c8529f17b9ed1eb49e1d01bc02be1
2020-11-20 08:21:56 +00:00
Chiachang Wang
b6f524b2df Move BasicShellCommandHandler to frameworks/lib/modules-utils am: d5726c1916 am: d3e4d83eb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483965

Change-Id: I0c01c2355d990e6e819ba6ac368ead2166f068f4
2020-11-20 08:21:53 +00:00
Chiachang Wang
d3e4d83eb7 Move BasicShellCommandHandler to frameworks/lib/modules-utils am: d5726c1916
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483965

Change-Id: Ib2a99f1aeb31b89e69a5b313ca3774ba145dde33
2020-11-20 07:47:11 +00:00
Chiachang Wang
1b414d61b4 Merge changes from topic "move_BSCH"
* changes:
  Remove BasicShellCommandHandler from frameworks/base
  Move BasicShellCommandHandler to frameworks/lib/modules-utils
2020-11-20 07:29:56 +00:00
Chiachang Wang
a68fbfafb7 Remove BasicShellCommandHandler from frameworks/base
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Remove BasicShellCommandHandler
from frameworks/base to frameworks/lib/modules-utils.

Bug: 170598012
Test: m
Change-Id: I81e01ba097392e8fe6eb27c01212a8fa1e4cbfad
Merged-In: Ida30c877116090616d4bf3f87fdad835446dac84
2020-11-19 05:32:14 +00:00
Chiachang Wang
d5726c1916 Move BasicShellCommandHandler to frameworks/lib/modules-utils
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: I8a2873df6e7d8342b7a8b466bda155f74c807ee3
Merged-In: Ida30c877116090616d4bf3f87fdad835446dac84
2020-11-19 03:16:03 +00:00
Alexander Zlatin
739620f26f Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag.
Bug: 143923100

Change-Id: I1a4f75d7e3fff538d418a956b8eead79bc0b3e55
2020-11-18 23:23:50 +00:00
Aurimas Liutikas
59d98a07a9 Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e am: 1c505e8cda
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: Ib1b078a6e6c6e19391277d19c0f8d748eee6300b
2020-11-16 21:40:21 +00:00
Aurimas Liutikas
1c505e8cda Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: Idd656e3803c247b03808259c582599898c064b27
2020-11-16 21:13:46 +00:00
Aurimas Liutikas
46a165215b Remove legacy style metalava suppression
@SuppressLint("Doclava125") is a legacy way of suppressing
RequiresPermission check. Updating to the new style of suppression
so metalava no longer has to support the legacy mode.

sed -i "s/@SuppressLint(\"Doclava125/@SuppressLint(\"RequiresPermission/" \
core/java/android/app/admin/DevicePolicyManager.java \
core/java/android/hardware/hdmi/HdmiControlManager.java \
core/java/android/hardware/location/ContextHubManager.java \
core/java/android/hardware/usb/UsbDeviceConnection.java \
core/java/android/net/TrafficStats.java \
core/java/android/os/RecoverySystem.java \
core/java/android/os/storage/StorageManager.java \
core/java/android/service/persistentdata/PersistentDataBlockManager.java \
location/java/android/location/LocationManager.java \
media/java/android/media/AudioManager.java \
telecomm/java/android/telecom/TelecomManager.java \
telephony/java/android/telephony/CarrierConfigManager.java \
telephony/java/android/telephony/TelephonyManager.java \
wifi/java/android/net/wifi/RttManager.java \
wifi/java/android/net/wifi/WifiScanner.java

Test: make
Exempt-From-Owner-Approval: No-op change
Merged-In: I6d5df95cfca2950ea86872d2f0afc1ba828841dc
Change-Id: I6d5df95cfca2950ea86872d2f0afc1ba828841dc
2020-11-12 18:30:12 -08:00
Steven Moreland
b908d8a2ee Merge "IBinder: support FLAG_CLEAR_BUF" am: 9910d9980e am: dcae11d0ef am: 951299fb04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477120

Change-Id: Id0c58b52a83187d6e9eeb6be2bc730c8a3c7f016
2020-11-11 18:23:53 +00:00