Commit Graph

14192 Commits

Author SHA1 Message Date
Dmitri Plotnikov
ebb8dfe3e5 Merge "Add PowerEstimators to the per-file OWNERS" am: 36a792091e am: becbe17ac0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67477b9f6c8f2216545e02d7c5822d0aff547ed
2021-01-11 21:38:02 +00:00
Dmitri Plotnikov
f8248eb2eb Add PowerEstimators to the per-file OWNERS
Test: N/A
Change-Id: I7777551640227d7bfefbaa68f03e82167be39237
2021-01-11 10:50:28 -08:00
Treehugger Robot
50e657d126 Merge "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()"" am: dacb8190e1 am: 12c3e9264b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543472

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef6f466e4fd872f3a643a4d21b55350a7be3042
2021-01-08 20:17:03 +00:00
Treehugger Robot
dacb8190e1 Merge "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()"" 2021-01-08 18:57:11 +00:00
Connor O'Brien
0648bad1b6 Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()"
This reverts commit 2eb8ad6245.

Reason for revert: Bug: 177011744

Change-Id: Ib9f1c0bda7d6df1b75dbe409f96dab39c1659781
2021-01-07 23:48:35 +00:00
Andrei-Valentin Onea
dd1d1cbacc Merge changes from topic "preinstall-overrides" am: 29ed176b46 am: d1ebbf5086
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94c9aca60ff8d5eec190434a2a22338cb04d5922
2021-01-07 17:35:17 +00:00
Andrei-Valentin Onea
29ed176b46 Merge changes from topic "preinstall-overrides"
* changes:
  Add force_non_debuggable_final_build_for_compat
  Allow overriding compat config prior to install time.
2021-01-07 14:04:12 +00:00
Connor O'Brien
51271ba04a Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" am: d5e143eee7 am: c5a860d297
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e7d114ffec9c4fe9c2f5378ce89c80a92590015
2021-01-07 01:09:20 +00:00
Connor O'Brien
d5e143eee7 Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" 2021-01-06 23:38:12 +00:00
Jeff Sharkey
4079cfc439 Merge "Update OWNERS for NetInitiatedActivity.java" am: 7283ceda9b am: 23519fbda4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf148f26961add3f0b43c6e853b3ab526a53008c
2021-01-05 17:16:55 +00:00
Jeff Sharkey
7283ceda9b Merge "Update OWNERS for NetInitiatedActivity.java" 2021-01-05 16:40:01 +00:00
Michael Sun
9660a9256e Merge "Revert "Add more logging for wakelock stats inquiries"" am: 4f1774283c am: d051fbac00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I737867f97653ab76aa2a50d0c2323b0337574262
2020-12-30 18:27:59 +00:00
Michael Sun
4f1774283c Merge "Revert "Add more logging for wakelock stats inquiries"" 2020-12-30 17:38:41 +00:00
Andrei Onea
224f8c01d7 Allow overriding compat config prior to install time.
If the user tries to apply an override for a package that is not yet
installed, the override is put into a 'deferred' bucket, to be validated
upon installation.
Overrides are rechecked every time an app is installed, updated or
deleted.
If a deferred override is valid at install or update time, it gets
promoted to a regular override.
If a deferred override cannot be applied upon app installation or
update, it remains deferred.
If an app is deleted, all its overrides become deferred.
When any of the reset commands are called for a given package, that
removes both regular and deferred overrides.

Bug: 158696818
Test: atest CompatConfigTest
Test: atest OverrideValidatorImplTest
Change-Id: I50eab62214d1325ec6185ddcfe9e8f425e11c98b
2020-12-30 14:37:12 +00:00
Yu-Han Yang
44e633e40a Update OWNERS for NetInitiatedActivity.java
Test: OWNERS update only
Change-Id: I3685a54c7f27880a99f8962530de87a61208bcc9
2020-12-29 11:03:07 -08:00
Chiachang Wang
67cba56eff Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: dcb4051101 am: 8495b1b1dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e255f46fc8b3d9fb3f4e1af4bd66b4a0e38369e
2020-12-28 02:02:08 +00:00
Chiachang Wang
dcb4051101 Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" 2020-12-28 01:05:28 +00:00
Serik Beketayev
40e7949c5f Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
2020-12-25 09:45:54 +00:00
Serik Beketayev
4abaecefc2 [Mainline] Migrate ProxyInfo
Bug: 173455434
Test: atest FrameworksNetTests
Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
2020-12-23 22:15:51 -08:00
Chiachang Wang
4dd4e08c4e [IT4.2] Update argument type of interfaceClassDataActivityChanged
The argument type of interfaceClassDataActivityChanged takes a
string for the network type. It requires both the receivers and
NMS to do type transformation. The transformation is a redundant
work. Update it to take integer directly and rename to
understandable naming.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ibe9fa7a1b71af2dab916b5d615742e77e4174c39
2020-12-23 17:34:08 +08:00
Chiachang Wang
a817ecd4b5 Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: baef452e38 am: 04aa5eac85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dea98c80dd4d6f29739b26cf120957c58364445
2020-12-23 06:49:23 +00:00
Chiachang Wang
baef452e38 Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" 2020-12-23 05:20:33 +00:00
Remi NGUYEN VAN
edc6b0fb67 Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: 635d60201d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b2eae7f9988ae8fa8c858709cafc17c1420f4b7
2020-12-23 02:07:05 +00:00
Remi NGUYEN VAN
3ed4fd3a89 Merge "Split NetworkUtils and NetworkUtilsInternal" 2020-12-23 01:19:27 +00:00
Treehugger Robot
ea70d5adc2 Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530761

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4370f8059802250c5bd9112a10573effba8551e
2020-12-22 23:23:24 +00:00
Treehugger Robot
7765329813 Merge "Add owner to codegen annotations" 2020-12-22 22:16:51 +00:00
Benjamin Schwartz
7805396ee6 Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 am: ec13727383
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32722ae3a7f5fbde2aa7d42402f8f2d670423f4b
2020-12-22 17:38:56 +00:00
Chiachang Wang
9c133bc4e9 [IT04] Add uid as parameter of interfaceClassDataActivityChanged
Add uid into interfaceClassDataActivityChanged in
INetworkManagementEventObserver. This helps the listeners to use
BaseNetworkObserver to listen for target evnets instead of using
whole INetdUnsolicitedEventListener with no-op in other event
that listeners do not care about.

Bug: 170598012
Test: m ; atest FrameworksNetTests
Change-Id: I2a42a522c2ff9b1e0be88261a8574bb7f5292fa6
2020-12-22 08:39:22 +08:00
Michael Sun
2ab53028af Revert "Add more logging for wakelock stats inquiries"
This reverts commit 757b01b94b.

Reason for revert: b:173539101 is root caused and AIDL pipeline is proved to transmit wakelock stats flawlessly.

Change-Id: I80c39d55b7d6464a4c8f894406c2393ac554ad66
2020-12-21 18:36:35 +00:00
Michael Sun
5886ede607 KernelWakelockReader: provide class level lock when updates staleStats
As the wakelock version number is defined as static to provide
consistent versioning across objects, class level static lock should be
implemented to prevent racing conditions.

To trigger the racing condition, update statsd's stats pulling logic
locally to repeatably requesting wakelock stats then wakeup the phone
to trigger BatteryStats update routine. The racing condition is 100%
reproducible under the setup. The patch has been verified with the
setup, and the racing is no longer seen. See more reproduce details in
the linked bug.

Bug: 173539101
Test: manual
Change-Id: I386afa2f2ecd8678e71ece978da4a9950b21ca4d
2020-12-21 18:09:04 +00:00
Alison Cichowlas
dc70bd944e Merge "Fix sharing shortcuts not showing for Work Profile." into rvc-qpr-dev am: ac9d6f53da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13230685

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141425524486e6a377b6be1062a17b0df13388d0
2020-12-18 00:34:12 +00:00
Connor O'Brien
2eb8ad6245 Clear BPF data in KernelCpuUidTimeReader.removeUid()
Currently KernelCpuUidTimeReader removes BPF cputime data in
removeUidsInRange(), but not in removeUid(), causing a leak where data
for some UIDs persists after it should have been removed. Update
removeUid() so that BPF data for removed UIDs is removed in both
paths.

Bug: 174739872
Test: open Chrome app & tabs & then close them; confirm isolated UID
data is removed.
Change-Id: I46315e37c2ac21a3964bb18f8fc9e050a83f97fe
Signed-off-by: Connor O'Brien <connoro@google.com>
2020-12-17 11:55:25 -08: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
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
Alison Cichowlas
b09236d867 Fix sharing shortcuts not showing for Work Profile.
Bug: 175042485, 175240616
Test: per repro instructions in bug
Change-Id: Iecbc57369f46fcae72d6acdb997ea8daacc77979
(cherry picked from commit 17cb4137ad)
2020-12-15 20:09:33 +00:00
Eugene Susla
224f3360ad Add owner to codegen annotations
Test: presubmit
Change-Id: Ie0de32e4f8321fe846e5f4aade7a087c1216a28c
2020-12-15 11:07:02 -08:00
Nicolas Geoffray
df634d7c4e Merge "Make Class.getPackageName public." am: 3a76c4c9aa am: 7a0acb4d34
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia30633196eef2c2fdbebde3ad87c9e19c3c8b58e
2020-12-15 18:28:30 +00:00
Nicolas Geoffray
3a76c4c9aa Merge "Make Class.getPackageName public." 2020-12-15 16:55:44 +00:00
Alison Cichowlas
1a55495ae9 Merge "Add SystemUI to OWNERS for Sharesheet." am: eff7324d9c am: ace8f705bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fc43cc854488c505479de6461ed56e02916955b
2020-12-15 15:50:36 +00:00
Alison Cichowlas
eff7324d9c Merge "Add SystemUI to OWNERS for Sharesheet." 2020-12-15 15:08:10 +00:00
Alison Cichowlas
e432f6c014 Add SystemUI to OWNERS for Sharesheet.
Change-Id: I2ecbab59516ae0cb53d47fa819c26336f76d9483
2020-12-14 21:46:41 +00:00
Wale Ogunwale
dfbbd0e5d7 Merge "Add more OWNERS coverages(2/n)" am: a2c85ce0ba am: 700b3d812f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1525ba52d4365241785b4789f7363aac0d32c4
2020-12-14 17:30:00 +00:00
Charles Chen
2c86c2cf8a Add more OWNERS coverages(2/n)
Test: manual
Bug: 174932174
Change-Id: Id6a4c60734f24a3d8fdec27b11baead550296441
2020-12-14 15:00:22 +08:00
Treehugger Robot
03ced7e52e Merge "Add missing IMF OWNERS" am: 4e3959e571 am: 30497d0911
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3534455778648e6be10ffedbd2d692656d88d318
2020-12-12 02:14:04 +00:00
Adrian Roos
bb4c35d0d2 Add missing IMF OWNERS
Test: n/a
Change-Id: Ib1ec672f872a3b1faf65c3583e300f473bac8f0c
2020-12-11 17:02:19 +01: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
TreeHugger Robot
0277812fc3 Merge "Fix wrong target launches in Chooser." into rvc-qpr-dev am: 14692e3d21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13157627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cda83f18f3f057b139f8218079065987bc1de82
2020-12-10 16:08:36 +00:00
TreeHugger Robot
14692e3d21 Merge "Fix wrong target launches in Chooser." into rvc-qpr-dev 2020-12-10 15:50:08 +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