Commit Graph

8201 Commits

Author SHA1 Message Date
Tianjie Xu
2aa7d539d3 Merge "Deprecate the old rebootAndApply API" am: cabef01cb3 am: 7a81aade1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533087

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0418e182285ee86aefcafb8edba7002229dbc5e
2020-12-21 19:20:28 +00:00
Tianjie Xu
cabef01cb3 Merge "Deprecate the old rebootAndApply API" 2020-12-21 18:53:20 +00:00
Todd Kennedy
e01d70114c Merge "Add OWNERS for incremental" am: b8ff8f238e am: 25d1667e00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5df3b15db2ef7cc56583d00a7d6f2e588b87c8a3
2020-12-17 23:17:45 +00:00
Tianjie
4343e3ebca Deprecate the old rebootAndApply API
This API isn't aware of slot switch, and shouldn't be used by
phonesky. So we prefer to deprecate it in case new callers use
it accidentally. Also don't allow callers with REBOOT permission
to call it.

Bug: 170664917
Test: build
Change-Id: I540b87fad461cb2c900f3e9d177bb5147abc1a22
2020-12-17 13:05:36 -08:00
Todd Kennedy
a2991e1001 Add OWNERS for incremental
Change-Id: Id0acdfff82c625fe05c6966956d1478ce8355a71
2020-12-17 17:20:10 +00:00
Treehugger Robot
ccd634ec0c Merge "Make a copy of libcore.util.ArraysUtils in framework" am: f35963cb77 am: acd5ae1807
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0232dc3e89ca638cf5097888946f7f70b3f116d1
2020-12-17 11:10:44 +00:00
Treehugger Robot
f35963cb77 Merge "Make a copy of libcore.util.ArraysUtils in framework" 2020-12-17 10:10:52 +00:00
Tianjie Xu
90c5c0509d Merge "Update the system API to support multi client RoR" am: 0b9d85dab5 am: 4bf68fc222
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8a094bf80c3fb0990d7011424f00508dcbcc356
2020-12-17 00:48:35 +00:00
Tianjie Xu
04218179bc Merge "Add multi client ror support" am: fa7173b8ac am: 0572043849
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483936

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9099a372d0612e96c409029ca79fc7ecfbf06648
2020-12-17 00:47:48 +00:00
Victor Chang
37c6b6deeb Make a copy of libcore.util.ArraysUtils in framework
It helps remove it from the @CorePlatformApi

Bug: 154796679
Test: ArrayUtilsTest
Merged-In: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
Change-Id: I0c8f194a74a16b2cc46f9eea4571d5fb674fbc28
2020-12-17 00:07:23 +00:00
Tianjie
41afcdc45b Update the system API to support multi client RoR
Detailed design in http://go/multi-client-ror. We will reuse most of
the old APIs, and there are a few notable changes
1. Infer the package name from the existing context
2. Remove the unused update token
3. Add the REBOOT permission, so phonesky can hold it.
4. Add a new API for rebootAndApply, which takes a slotSwitch parameter

Bug: 170664917
Test: build

Change-Id: Icb012138bd1789ce03564aa255e5bd4e84374130
2020-12-16 23:40:28 +00:00
Tianjie Xu
fa7173b8ac Merge "Add multi client ror support" 2020-12-16 23:39:31 +00:00
Tianjie
acea5f3b54 Add multi client ror support
Detailed design in http://go/multi-client-ror. This cl adds internal
states in RecoverySystemService to keep track of multiple RoR
callers. The general principles works as:
1. Each client should call prepare before reboot
2. One client cannot clear the preparation of another client
3. If multiple clients have prepared the update, the subsequent
   reboot will be first come, first served.

Bug: 170664917
Test: atest FrameworksServicesTests:RecoverySystemServiceTest

Change-Id: Ic8c7438f8a0300870ceed8857c46425fc0d006b9
2020-12-15 21:12:12 -08:00
Peiyong Lin
28613f9d31 Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev am: 23ace73ac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13229183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f201739a456f9580328670189e506e284feb2e
2020-12-15 19:10:01 +00:00
Peiyong Lin
23ace73ac4 Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev 2020-12-15 19:02:54 +00:00
TreeHugger Robot
946b5ee77a Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev am: 9622b6d7d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id450db7d6874e2e1f4832b8dc0c40f972d62bf18
2020-12-15 18:48:15 +00:00
Peiyong Lin
3cb225dc74 [GraphicsEnvironment] Avoid null access.
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: N/A
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
2020-12-15 10:22:53 -08:00
Peiyong Lin
d22eebefdb [GraphicsEnvironment] Avoid null access.
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: b/175699044
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
2020-12-15 17:54:45 +00:00
Jeff Sharkey
a2ae9eb6e1 Merge "Update the owner of recovery systems" am: 612b7e7d1d am: 483f980afe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idffa8d9f4d9473b205244a92e222cee5e2d6f99b
2020-12-15 00:45:09 +00:00
Jeff Sharkey
44a90dab48 Merge "Add OTA team as the owner of recovery systems" am: 8ef2e0426a am: 305b2ce554
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528858

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47e7c56345f66dd137ba664eed24d01ba7a2cfab
2020-12-15 00:44:58 +00:00
Tianjie
a809a05b92 Update the owner of recovery systems
Use the same owner file from the services.

Test: build
Change-Id: I976c90c2fd16efe20ca3b944c6e45c30550e3226
2020-12-14 16:24:12 -08:00
Tianjie
221cad235d Add OTA team as the owner of recovery systems
The RecoverySystem mostly handles OTA update and interactions with
the recovery mode. Add the ota team as the owner.

Test: build
Change-Id: I81bae46d919ea70f04729d34b62d4a569541d914
2020-12-14 15:23:42 -08:00
Gavin Corkery
11c28aeb13 Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e am: 7611ac2a5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib170bb6f36a086ac7fcab2c0bfc29153f9335a47
2020-12-14 19:19:08 +00:00
Gavin Corkery
d45d533b6e Merge "Replace broadcast with adding a method in BugreportCallback" 2020-12-14 18:55:55 +00:00
Rafal Slawik
47ac3aae22 Combine uids for CpuTimePerUidFreq atom
The puller for the atom frequently fails. We believe it is due to the
size of the pulled atoms. No metric can be correctly build from this
atom.

To reduce the size, we apply transformations that we would likely
perform when analyzing this data. We combine times for all shared app
gids together and combine times for the same apps. We also exclude
isolated uids which are frequently recycled and removed from the
underlying data source.

If these optimization do not help, we will need to introduce different
atoms.

Bug: 157535126
Test: cmd stats pull-source 10010
Change-Id: I0d9a18c78f456e1b0f9d7ad322f15354ead9f02b
Merged-In: I0d9a18c78f456e1b0f9d7ad322f15354ead9f02b
(cherry picked from commit e69ade3545)
2020-12-14 17:24:25 +00:00
Treehugger Robot
d4e9c105b9 Merge "Add another property for the ODM SKU (ro.boot.product.*)" am: 9b432d22a4 am: 42f9775b38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42fe01edc55ca20afe9ff9761dc55be625b418ab
2020-12-14 16:27:42 +00:00
Treehugger Robot
9b432d22a4 Merge "Add another property for the ODM SKU (ro.boot.product.*)" 2020-12-14 14:58:20 +00:00
Chiachang Wang
fced6020f8 Merge "Resolve UidRange dependency between NMS and CS module" am: c3806f72b7 am: d7795cd590
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34efef1e3b485de6c93f78c4401ea92fa8edfe4
2020-12-14 03:49:42 +00:00
Chiachang Wang
c3806f72b7 Merge "Resolve UidRange dependency between NMS and CS module" 2020-12-14 02:55:41 +00:00
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
Chiachang Wang
c92383fd6d Resolve UidRange dependency between NMS and CS module
ConnectivityService is going to become a mainline module which
cannot access hidden APIs. Thus, replace the VPN uid range
controlling APIs from NMS to INetd directly.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest HostsideVpnTests
Test: manually test to connect to VPN and check the uid range
Change-Id: Ie6656ef36f54c2f14d5a2899e763a29b70a30f5d
2020-12-10 22:24:47 +08: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
Robin Lee
5ecccda5fe Add another property for the ODM SKU (ro.boot.product.*)
The canonical SKU is set by the bootloader.
ODM SKU is set by vendor-init.

Change-Id: I41add97c53c0f09eb0058b78dd194a8b87cdea01
Test: atest android.os.cts.BuildTest
Bug: 155840001
Bug: 151157621
2020-12-04 17:10: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