Alisher Alikhodjaev
e11bf049a9
Merge "Correct OMAPI OWNERS" am: 2046b3f187 am: 7d825375a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide1c94afe872365d69f34bd62200e6990b10c585
2021-01-21 23:08:57 +00:00
Automerger Merge Worker
b8349d34c2
Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc
2021-01-21 23:08:41 +00:00
TreeHugger Robot
7a606738dc
Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf337d347c30f5b34bac2fe86fd55a142d2a3647
2021-01-21 23:08:26 +00:00
Benedict Wong
f8e1ebb616
Merge "Add base states with exception catching and utility functions" am: 4d06114362 am: c048e78913
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36687edcbbe2cd6165e02b924372c0d666daacfb
2021-01-21 23:08:14 +00:00
Mitch Phillips
493aea7495
Merge "[MTE] Add SYNC compat feature & disable for system apps." am: 284195e759 am: 6d521a4b8c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibba6138e7e5d0dcfdb6fdd3fab9d9cb8ee8f8b0a
2021-01-21 23:07:59 +00:00
Yu-Han Yang
d0fb2a7aef
DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1472c4aa1300628e60a4012bb7579018ea37609f
2021-01-21 23:07:04 +00:00
Alisher Alikhodjaev
7d825375a1
Merge "Correct OMAPI OWNERS" am: 2046b3f187
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5077575ad0cfd8cb7d6ac453ccd29690cffb833
2021-01-21 22:09:10 +00:00
Benedict Wong
c048e78913
Merge "Add base states with exception catching and utility functions" am: 4d06114362
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9304bd61b7d20a6fa3d3144aec855ba0fecaa28a
2021-01-21 22:00:51 +00:00
TreeHugger Robot
94b4830cb8
Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev
2021-01-21 21:27:12 +00:00
Mitch Phillips
6d521a4b8c
Merge "[MTE] Add SYNC compat feature & disable for system apps." am: 284195e759
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iab3c497819e9d5e07daf53bc6a641eca2150f1ba
2021-01-21 21:16:56 +00:00
Alisher Alikhodjaev
2046b3f187
Merge "Correct OMAPI OWNERS"
2021-01-21 20:14:50 +00:00
Benedict Wong
4d06114362
Merge "Add base states with exception catching and utility functions"
2021-01-21 20:12:52 +00:00
Nathan Harold
66a873b567
Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f42 am: 47e1305bd6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543459
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5fb6ff5923d029b367c754759f7b7deca7a63dfe
2021-01-21 19:31:21 +00:00
Rambo Wang
52c1eb1ace
Merge "Support new APIs in TelephonyManager to set/clear signal update request" am: 32c30af109 am: da259eccfa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532512
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f47ec228c940bcf91ed93e078da137a713ee8c0
2021-01-21 19:31:00 +00:00
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
Mitch Phillips
284195e759
Merge "[MTE] Add SYNC compat feature & disable for system apps."
2021-01-21 19:30:14 +00:00
Nathan Harold
47e1305bd6
Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543459
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic371acb7f276df9c30848929f6066ab448648a3d
2021-01-21 19:20:03 +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
Rambo Wang
da259eccfa
Merge "Support new APIs in TelephonyManager to set/clear signal update request" am: 32c30af109
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532512
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia058f2795377e9a467c1877bf25df852cbef5329
2021-01-21 19:11:22 +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
Nathan Harold
2b79ba7f42
Merge "Revert "Revert "Fix permission on TM#isDataEnabled"""
2021-01-21 19:04:12 +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
Rambo Wang
32c30af109
Merge "Support new APIs in TelephonyManager to set/clear signal update request"
2021-01-21 18:35:57 +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