Commit Graph

563772 Commits

Author SHA1 Message Date
Ryan Mitchell
514b93a67b Merge changes I33358ce4,I5746ffae,Ie307ce30,I8cd5eb46,Ie02ddd37, ... am: 0b5e65b81d am: 77ad0e767c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbf5c68c939202662e62e4031f128f40c805af52
2021-01-21 19:30:27 +00:00
Jack Yu
880c028103 Merge "Enabled TEMP_NOT_METERED support for carriers" into rvc-qpr-dev-plus-aosp 2021-01-21 19:12:54 +00:00
Ryan Mitchell
77ad0e767c Merge changes I33358ce4,I5746ffae,Ie307ce30,I8cd5eb46,Ie02ddd37, ... am: 0b5e65b81d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01457df78951ca3c400683d69132cc7cba2c5a4e
2021-01-21 19:06:15 +00:00
Automerger Merge Worker
d01a6469d9 Merge "Merge "Dynamic Audio Buffer (1/3)" am: 75da9f9f27 am: 6b3d9261b0" into rvc-qpr-dev-plus-aosp 2021-01-21 18:56:42 +00:00
Zach Johnson
d313320f6b Merge "Dynamic Audio Buffer (1/3)" am: 75da9f9f27 am: 6b3d9261b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74b1f32014f0ecb095b3e689e8b1cb1c62eb539f
2021-01-21 18:56:30 +00:00
TreeHugger Robot
617e4570cb Merge "Add a new reason code for IMS call failed due to network congestion" into rvc-qpr-dev am: 572c7f769c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13351221

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7977e10af0c615b69b34a0e32c8652a349a7d1a8
2021-01-21 18:56:27 +00:00
Ryan Mitchell
0b5e65b81d Merge changes I33358ce4,I5746ffae,Ie307ce30,I8cd5eb46,Ie02ddd37, ...
* changes:
  OMS: reduce number of OVERLAY_CHANGED broadcasts
  Revert "Revert "OMS: add transactional API""
  Revert "Revert "Push OverlayDeviceTests onto /system""
  Revert "Revert "OMS: add tests for the OMS transactional API""
  Revert "Revert "OMS: block until settings are persisted""
  Revert "Revert "OMS: replace OMSImpl.OverlayChangeListener with return v...""
2021-01-21 18:24:56 +00:00
TreeHugger Robot
572c7f769c Merge "Add a new reason code for IMS call failed due to network congestion" into rvc-qpr-dev 2021-01-21 17:57:22 +00:00
Zach Johnson
6b3d9261b0 Merge "Dynamic Audio Buffer (1/3)" am: 75da9f9f27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0ce1c265356f0919a5a685fa3db093bf9352ca3
2021-01-21 17:45:41 +00:00
Zach Johnson
75da9f9f27 Merge "Dynamic Audio Buffer (1/3)" 2021-01-21 17:28:17 +00:00
satayev
7c54084978 Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibaba3d4287cb970703f1f071f6373d5205ba94e1
2021-01-21 15:36:37 +00:00
Mårten Kongstad
ea0b864a1a OMS: reduce number of OVERLAY_CHANGED broadcasts
As part of "I63df58510:OMS: add transactional API", the OMS changed how
to broadcast OVERLAY_CHANGED. The intent used to be sent <once> when an
overlay changed state. This was modified to <once per package affected>
when an overlay changed state.

While this makes it easier for applications to detect if they have been
forced to reload their resources, the change drastically increased the
number of OVERLAY_CHANGED intents, especially when the target package is
"android" which affects all packages. To make matters worse, the package
manager responds to an OVERLAY_CHANGED intent by broadcasting
PACKAGE_CHANGED.

Ultimately the flood of intents caused lock contentions in the activity
manager.

Revert the OMS strategy for how to broadcast OVERLAY_CHANGED to the old
behaviour.

Bug: 177065099
Test: atest FrameworksServicesTests:com.android.server.om OverlayDeviceTests OverlayHostTests CtsAppSecurityHostTestCases:OverlayHostTest
Test: manual: adb exec-out cmd activity dump  # check for OVERLAY_CHANGED in "Historical broadcasts"
Change-Id: I33358ce4dc1d72e6e695c70cf02ab72526592b17
2021-01-21 14:33:40 +00:00
Mårten Kongstad
dc427169c9 Revert "Revert "OMS: add transactional API""
This reverts commit 295e0d7183.

Change-Id: I5746ffae41f3e907c39420dce433c4dc91d1145c
2021-01-21 14:33:31 +00:00
Mårten Kongstad
f7da01f0c4 Revert "Revert "Push OverlayDeviceTests onto /system""
This reverts commit 118ddbccc9.

Change-Id: Ie307ce308aa45c0b6fcd5ff7001153c41ea8b7f8
2021-01-21 14:33:18 +00:00
satayev
e0ef4a9aab Merge "Enable @TestApi access for instrumentation." am: f1d5754c10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85cd5a81c98aa96629f0e2cad9e7a45ec3e5faac
2021-01-21 14:32:51 +00:00
Mårten Kongstad
fd715a9a59 Revert "Revert "OMS: add tests for the OMS transactional API""
This reverts commit 0ad9a225d4.

Change-Id: I8cd5eb46cfefdeaab783716c270059ea3faf9153
2021-01-21 14:32:42 +00:00
Mårten Kongstad
c72ce7521e Revert "Revert "OMS: block until settings are persisted""
This reverts commit b8c651c9a8.

Change-Id: Ie02ddd3710395c3c53ca3604076c5f34c73b8387
2021-01-21 14:32:32 +00:00
Mårten Kongstad
d7074e1cee Revert "Revert "OMS: replace OMSImpl.OverlayChangeListener with return v...""
This reverts commit 8448c33e93.

Change-Id: I8fbbd8106acd9e11f1a0c14cdf823561f64eca5e
2021-01-21 14:32:20 +00:00
satayev
f1d5754c10 Merge "Enable @TestApi access for instrumentation." 2021-01-21 14:13:44 +00:00
Anton Hansson
d3b2fdc7d1 Merge "Update framework/base/apex OWNERS" am: 8c03d3c0d8 am: 7e79bdede8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89f46cdea0f9d2b9a8ec869800b5697a6812fd92
2021-01-21 13:49:11 +00:00
Anton Hansson
5e4e7ceca9 Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39b2203f51671a315c978d949a1d7dc51e1305b
2021-01-21 13:48:49 +00:00
Anton Hansson
7e79bdede8 Merge "Update framework/base/apex OWNERS" am: 8c03d3c0d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43270fe0ac74e475f5419dc780ec2151685de0da
2021-01-21 13:30:55 +00:00
Anton Hansson
d787b0501a Merge "Dist more API txt files" am: 45b39d81c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e4c654503a6fda7a8ccbdf7459d75c4f445a7ba
2021-01-21 13:26:26 +00:00
Anton Hansson
8c03d3c0d8 Merge "Update framework/base/apex OWNERS" 2021-01-21 12:25:27 +00:00
Anton Hansson
45b39d81c4 Merge "Dist more API txt files" 2021-01-21 12:23:36 +00:00
Chiachang Wang
d386a2a2b9 Merge "[IT4.4] Host network activity related logic into a new class" am: 14cb00fd50 am: b2cf9573bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9d356627445c81993ba4ed2048d621e70ebca0e
2021-01-21 10:01:05 +00:00
Chiachang Wang
b2cf9573bd Merge "[IT4.4] Host network activity related logic into a new class" am: 14cb00fd50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6158f29302241703367b5392d2f0adcf6f6ccf57
2021-01-21 09:21:33 +00:00
Chiachang Wang
c5698a5bc9 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 am: 2de3786907
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If57e12227a2735853911ca6271a211571ddb633b
2021-01-21 09:19:46 +00:00
Paul Hu
892fa611ea Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e902b am: 465b565d49
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib68e5eb2ce60a616b25b6d0a45b2af143660865f
2021-01-21 08:55:37 +00:00
Chiachang Wang
2de3786907 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b7818c5fc851a5b2a1406caec0db3dac3ff55c7
2021-01-21 08:55:33 +00:00
Chiachang Wang
a6b2596d7f Merge "[IT4.3] Listen interface change in BSS" am: c95ab361c7 am: 97b07f5b2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib51a30f6c2b7836df82e250c82194d73cb8caa80
2021-01-21 08:55:15 +00:00
Jack Yu
ea53b4ef65 Enabled TEMP_NOT_METERED support for carriers
Enabled TEMP_NOT_METERED support for carriers by default.

Bug: 176119724
Test: Manual
Change-Id: Ie0323a354c89abf1a0effa0b65cde3b4d010115e
2021-01-21 00:46:14 -08:00
Chiachang Wang
14cb00fd50 Merge "[IT4.4] Host network activity related logic into a new class" 2021-01-21 08:41:15 +00:00
Chiachang Wang
39efdb2451 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" 2021-01-21 08:40:53 +00:00
Chiachang Wang
92b94e1ec5 Use ParcelFileDescriptor instead of FileDescriptor in the aidl
Using FileDescriptor in the aidl will refer to
Parcel.readRawFileDescriptor() and Parcel.writeRawFileDescriptor()
whilie trying to do parcel operations. Those two APIs are hidden
and not accessible for the incoming ConnectivityService mainline
module. For such use cases in a module, it should be replaced by
using ParcelFileDescriptor that is designed for such usages.

Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ia7e3a71ccb4b136cc55c9e90a384870c32cfd37b
2021-01-21 08:40:12 +00:00
Paul Hu
465b565d49 Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e902b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f441fba920d6228be47b2025fcf7303e496da8
2021-01-21 08:07:51 +00:00
Chiachang Wang
97b07f5b2e Merge "[IT4.3] Listen interface change in BSS" am: c95ab361c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33a02ef90a8e5a9699e94b34b6a3d82f20a4b505
2021-01-21 07:57:06 +00:00
Paul Hu
e8bf3e902b Merge "Replace Context @hide API in MultinetworkPolicyTracker" 2021-01-21 07:53:19 +00:00
Chiachang Wang
c95ab361c7 Merge "[IT4.3] Listen interface change in BSS" 2021-01-21 07:41:54 +00:00
Treehugger Robot
e431563a7c Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d am: 6c75038336
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9103e40a248ef3bbdd0f758aebe0b5e21e4372c
2021-01-21 07:22:47 +00:00
Treehugger Robot
6c75038336 Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b6f3e472bd1408b9674e48f046e8cd6c64d8b2
2021-01-21 07:01:13 +00:00
Remi NGUYEN VAN
0397559e6f Merge "Mark TestNetworkManager as module API" am: 24ea1e0377 am: ae781e1b30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363b288609514251f1e5ec337f56368180d2b259
2021-01-21 06:59:55 +00:00
Treehugger Robot
2a0f125d7d Merge "Add MANAGE_TEST_NETWORKS to system API" 2021-01-21 06:41:04 +00:00
lucaslin
140ebe5c99 [IT4.4] Host network activity related logic into a new class
Create an inner class to handle the network activity related
logic to isolate the code for code cleanliness. It's helpful for
the follow-up modifications to move network activity logic from
NMS to CS to support Connectivityservice mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I33b3b11f2700cb10eb6e3b58b6dfa52251bece80
2021-01-21 06:27:23 +00:00
Chiachang Wang
fee853b8a1 [IT4.3] Listen interface change in BSS
Reporting interface change is planning to move from NMS to CS
for incoming CS mainline. The event sent from CS to NMS will
be replaced by sending to netd directly, so the change reported
via NMS to BSS should be handled by BSS directly. This commit
allows BSS to listen interface change itself to separate the
design.

Bug: 170598012
Test: m ; atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I4c9202be31cad09451ef47ac7b5b87f7efb2020c
Merged-In: I9c1b2294905d3b59f6945c3f8acb91b2e419b492
2021-01-21 06:27:02 +00:00
Remi NGUYEN VAN
ae781e1b30 Merge "Mark TestNetworkManager as module API" am: 24ea1e0377
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1677f8f4fa436450ebc4d83cc10ff8503f2f9f2
2021-01-21 06:22:58 +00:00
Zoey Chen
db3611e6ec Merge "[PhysicalChannelConfig] Deprecated getChannelNumber and implement relevant API" am: e61da845fa am: 388fa199cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553957

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I627f91a65c853537bc4ddd4f01c34e8ef59a9aa6
2021-01-21 06:04:40 +00:00
Daniel Bright
f95800d6ba Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware" am: 2c8f0de95c am: 7c2815e531
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ab384c510fba999d503a96ca2cc65e6760fad28
2021-01-21 06:02:54 +00:00
Remi NGUYEN VAN
24ea1e0377 Merge "Mark TestNetworkManager as module API" 2021-01-21 06:02:25 +00:00
Zoey Chen
388fa199cc Merge "[PhysicalChannelConfig] Deprecated getChannelNumber and implement relevant API" am: e61da845fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553957

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ae13659696ccfea9fc7fa06be0a70d659e056da
2021-01-21 05:50:36 +00:00