Commit Graph

568184 Commits

Author SHA1 Message Date
Treehugger Robot
21cf15bf5c Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd21c am: de806ecda0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Idc486dfbfba3d04d27fb80acd8f31a897e59b01c
2021-03-24 18:53:56 +00:00
Wonsik Kim
50ce5087fd DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters am: 197e1a7f5e am: 309d58c0cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Iaec49578abb040e62ab8e9718e2cbb5941888ebc
2021-03-24 18:53:54 +00:00
Treehugger Robot
90e1746fe1 Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e am: 13b4d67d40
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: I99fe564e3fd7e6e92416a3d76054e62969cdd48f
2021-03-24 18:53:30 +00:00
Treehugger Robot
de806ecda0 Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd21c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Id5cd1023f628ed4274755bbc0d78aeaedfa89b8f
2021-03-24 18:22:27 +00:00
Wonsik Kim
309d58c0cb DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters am: 197e1a7f5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: I741906abf08c9cec198478d50662cdba94580f95
2021-03-24 18:17:43 +00:00
Hui Yu
51def1dc06 Merge "Allow FGS started from MediaButtonReceiver to have while-in-use permissions." into rvc-qpr-dev am: 4221ca489c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13857805

Change-Id: I3982b3754778fd40303d501b89b3a3bf2483b0ae
2021-03-24 18:14:54 +00:00
Treehugger Robot
13b4d67d40 Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: If272068940e9a06efbb40149e2b4dd5fbb1185d6
2021-03-24 18:13:19 +00:00
Hui Yu
4221ca489c Merge "Allow FGS started from MediaButtonReceiver to have while-in-use permissions." into rvc-qpr-dev 2021-03-24 17:41:39 +00:00
Treehugger Robot
59035dd21c Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" 2021-03-24 17:36:33 +00:00
Treehugger Robot
8c03c2a82e Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." 2021-03-24 17:22:50 +00:00
Treehugger Robot
7ac3288abc Merge "Don't try to report non-existent stats" am: 8c9b5df98a am: 6c65088897
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649153

Change-Id: Ifbe880018138218cb65e1281c6c6a23392365c72
2021-03-24 17:21:56 +00:00
Treehugger Robot
6c65088897 Merge "Don't try to report non-existent stats" am: 8c9b5df98a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649153

Change-Id: Id29d2368b9ee734b870134edcfa65b517d05a801
2021-03-24 16:43:28 +00:00
Sudheer Shanka
d533fa78b1 Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.
These constants will now be including all the reasons for why an
uid's network access can be blocked, instead of only the
restrictions that could be imposed by NPMS.

Bug: 183473548
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4
Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4
2021-03-25 01:33:26 +09:00
Treehugger Robot
8c9b5df98a Merge "Don't try to report non-existent stats" 2021-03-24 16:12:45 +00:00
Charles Chen
0d35481d52 Merge "Add OWNERS for ComponentCallbacksController" am: 4eca6d0c5c am: 06b102a70d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642179

Change-Id: Ie4c1fd204c01f81b09818ba6ae3dc9f3a13fadb9
2021-03-24 11:13:57 +00:00
Charles Chen
06b102a70d Merge "Add OWNERS for ComponentCallbacksController" am: 4eca6d0c5c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642179

Change-Id: I9e032b1715e0e30f868428ff5d5ab2351a3222e2
2021-03-24 10:28:17 +00:00
Charles Chen
4eca6d0c5c Merge "Add OWNERS for ComponentCallbacksController" 2021-03-24 10:05:52 +00:00
Hui Yu
ebfad50cc1 Allow FGS started from MediaButtonReceiver to have while-in-use
permissions.

1. Create FgsWhileInUseTempAllowList, the uid on this list is allowed to
have while-in-use permission when the FGS is started from background for
a duration of time.
2. When media button is pressed, the targetUid is added to
FgsWhileInUseTempAllowList for the duration of 10 seconds, this way the
targetUid can start FGS from background and have while-in-use permission.
3. When checking for ProcessRecord.
mAllowBackgroundActivityStartsTokens, it is the caller app's
ProcessRecord should be checked instead of the service's ProcessRecord.

Bug: 182481312
Test: use b/167998084 reproduce steps, use Line app to make a voip call, the
 receiver side screen is unlocked, the receiver side uses bluetooth
headset button to pick up the call, "dumpsys activity -a" shows the FGS
"com.linecorp.voip.core.common.notification.VoipNotificationCommand" has
"allowWhileInUsePermissionInFgs=true" and "isForeground=true".

Change-Id: Ic80aefe4202fe2210881bb8eea24b6e34cb1e7d0
Merged-In: I32a14d675550cd262976bb8e16a48a070387d318
2021-03-23 23:19:19 -07:00
Lucas Lin
cc0de009be Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" am: ac06b167f9 am: 9214c04e45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649305

Change-Id: I9428a5954d7461f6e8ae0e1a28cf9a3ecc4a7859
2021-03-24 05:25:35 +00:00
Lucas Lin
9214c04e45 Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" am: ac06b167f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649305

Change-Id: I4a4bb433b565539d33dfeb515a277b0b61a2aa91
2021-03-24 04:44:17 +00:00
Lucas Lin
ac06b167f9 Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" 2021-03-24 04:02:56 +00:00
Chiachang Wang
8f3e66d300 Merge "Remove the hidden NetworkRequest usage" am: b2d5ab569c am: c24bbc6449
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649296

Change-Id: I9a56cec9e617f6706c807563e59cb4445e713765
2021-03-24 04:01:02 +00:00
Chiachang Wang
c24bbc6449 Merge "Remove the hidden NetworkRequest usage" am: b2d5ab569c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649296

Change-Id: I88ec60e29e8a9e9b5511ce6b77bb7ec8bc7cbec8
2021-03-24 03:19:00 +00:00
TreeHugger Robot
c83efa9bb0 Merge "Prevent caching unexpected IME shown state for legacy split" into rvc-qpr-dev am: 302f9bd796
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911315

Change-Id: I0af5e8320598a30373a07759a723a8cb2aa06278
2021-03-24 03:18:26 +00:00
TreeHugger Robot
204473a07f Merge "Make sure to hide IME adjust dims when exiting split mode" into rvc-qpr-dev am: 8fab4c9222
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13838659

Change-Id: I603a7b677cab9598e039b569c6ae9aec691fa5e0
2021-03-24 03:17:35 +00:00
Wonsik Kim
197e1a7f5e DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters
Bug: 183242434
Test: atest android.media.cts.MediaCodecTest
Change-Id: Iaef8f8aef564dc8cda84a83f6cc628d87649b43d
2021-03-24 02:51:59 +00:00
Chiachang Wang
b2d5ab569c Merge "Remove the hidden NetworkRequest usage" 2021-03-24 02:41:27 +00:00
TreeHugger Robot
302f9bd796 Merge "Prevent caching unexpected IME shown state for legacy split" into rvc-qpr-dev 2021-03-24 02:36:17 +00:00
TreeHugger Robot
8fab4c9222 Merge "Make sure to hide IME adjust dims when exiting split mode" into rvc-qpr-dev 2021-03-24 02:36:12 +00:00
Rambo Wang
507e3b9dcd Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: c289c9b0a2 am: 506d5c92c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636779

Change-Id: Ib28c8dbc5a44d838ddb734fe80f728613c9aff43
2021-03-24 02:34:47 +00:00
Rambo Wang
57456a7152 Public ServiceState#duplexMode in telephony provider am: 4481b5181e am: b336d92aa7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1638159

Change-Id: I26eda51e6dca02fb978d1f28238afa7bcf697810
2021-03-24 02:34:39 +00:00
Benedict Wong
55ed7ee12b Merge "Check carrier privilege permissions with package name" am: f1a81b04b1 am: cc103b3c7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649652

Change-Id: I6a7721ad113fb28a6ec18ebcc2f6bda31cbd0e7e
2021-03-24 02:34:04 +00:00
Rambo Wang
506d5c92c3 Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: c289c9b0a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636779

Change-Id: Ie585b5c66b4e0f02e712fd4395a4f178ec908cba
2021-03-24 01:57:17 +00:00
Rambo Wang
b336d92aa7 Public ServiceState#duplexMode in telephony provider am: 4481b5181e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1638159

Change-Id: I97b30b534e5d49078b3841125bbe033d1b370077
2021-03-24 01:54:44 +00:00
Benedict Wong
cc103b3c7a Merge "Check carrier privilege permissions with package name" am: f1a81b04b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649652

Change-Id: I1f6533951cc30f07bc10ad7355ec1833590ca8db
2021-03-24 01:51:14 +00:00
Rambo Wang
c289c9b0a2 Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode"
* changes:
  Export ServiceState#DataRegState into telephony provider
  Public ServiceState#duplexMode in telephony provider
2021-03-24 01:22:51 +00:00
Benedict Wong
f1a81b04b1 Merge "Check carrier privilege permissions with package name" 2021-03-24 01:19:35 +00:00
Benedict Wong
d68c1f6cb2 Check carrier privilege permissions with package name
This change ensures that carrier privileges for the right packages are
always checked.

Bug: 183465199
Test: atest FrameworksVcnTests
Change-Id: If46c660e54870529868a7b4b1e271c9009b81d45
2021-03-23 17:42:12 -07:00
Jordan Liu
41adde9ab3 Merge "Add resource to disable cb" am: d7858116ca am: 52c4c695a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650607

Change-Id: I1c75fcbafe846e303ab9d0d46cb8679baa3bbab5
2021-03-23 23:15:03 +00:00
Tianjie Xu
b5cb526563 Merge "Clear caller id when reading device config" am: d0fe0c721d am: 08b5ccae7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651267

Change-Id: Ifc338b34e2271063c077f15335113efc2dacedfb
2021-03-23 23:14:36 +00:00
Jordan Liu
52c4c695a8 Merge "Add resource to disable cb" am: d7858116ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650607

Change-Id: I84149e8db1bda3ee432f557ccdf5a5b70bfb7640
2021-03-23 22:57:32 +00:00
Tianjie Xu
08b5ccae7d Merge "Clear caller id when reading device config" am: d0fe0c721d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651267

Change-Id: I31660fef5e49fe49364d265289aa1633898f85a9
2021-03-23 22:54:10 +00:00
Treehugger Robot
dca7627388 Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558e3 am: 73ea991b80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623839

Change-Id: Iee503efcee7f950891876b5b7b4391c1bb8c2fbe
2021-03-23 22:34:06 +00:00
Francois Gaffie
17869bc188 [Notification] Fix Notification channel Dnd bypass for multiusers am: 92a9f5fc1d am: 1b42ecc10a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605518

Change-Id: I597e53392bedd2cf120a7b991487cc746c01084a
2021-03-23 22:34:02 +00:00
Jordan Liu
d7858116ca Merge "Add resource to disable cb" 2021-03-23 22:23:19 +00:00
Tianjie Xu
d0fe0c721d Merge "Clear caller id when reading device config" 2021-03-23 22:10:38 +00:00
Treehugger Robot
73ea991b80 Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623839

Change-Id: If541a02594455f78d30a4126396c4aa84fa24b6e
2021-03-23 21:54:44 +00:00
Francois Gaffie
1b42ecc10a [Notification] Fix Notification channel Dnd bypass for multiusers am: 92a9f5fc1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605518

Change-Id: Icea0d4dd9bec99312c9d5d0b2e8d44d230081eb5
2021-03-23 21:52:30 +00:00
Treehugger Robot
abffe558e3 Merge changes from topic "audiomanagertest_cts_dnd"
* changes:
  [Notification] Fix NotificationManagerServiceTest
  [Notification] Fix Notification channel Dnd bypass for multiusers
2021-03-23 20:48:21 +00:00
John Reck
7ed71bc418 Merge "Fix thread-shared field evades lock acquisition reported by Coverity" am: 66fc99d578 am: 7427d997f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646974

Change-Id: I6b290dc2cbb93837e74ea5040b359e72d22beab0
2021-03-23 20:28:06 +00:00