Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2967634



Change-Id: If87bca8e5b14902117a11cd0987f4549f31098a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main am: c99012b6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977531



Change-Id: I26ad96fd2fac533dfcc9e284ca4d0de0b2f5bc75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2966947



Change-Id: Idfe70a057ba0479ad5f4c085829c51debfd8f3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Add jarjar_prefix to framework-minus-apex" into main am: 8095041d -s ours

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970331



Change-Id: Ia7a0a7817a7ff37cc687b9263d71caa1441791c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970331



Change-Id: I55d9f942eb45187fdd5bfe90243f79febc48765a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Revert "Add jarjar_prefix to framework-minus-apex"" into main am: 9f5f7378 -s ours

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2962255

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970212



Change-Id: I79461835ea9b76e7c4750e592f0fafdff0e1795f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2962255

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2970212



Change-Id: Idd1bec60842ee958294eddfb27162312478decc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2971614



Change-Id: I37c3b716f5e39531ac45ce4cd0d53983e99f45fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2977631



Change-Id: I6c067ef3ea5e7b680e0dc64d6e209b3524c7fcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2941325



Change-Id: I0dfa89d4576e8b0a56d9c6a51f29f34501a051ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Merge "Add OWNERS files for media-related packages" into main am: 098ba9f3" into aosp-main-future

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2973731



Change-Id: I696ecc63ea8004c37743cc4a3a41c506bbd2a833
Merged-In: I22553d0b76b4b8b3decd90a38368ba5b53acc405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

The `Notification.Style` class is an abstract class with a publicly
visible constructor and so the assumption is it is expected to be
extended by Apps. As such it cannot have any hidden abstract methods as
that would prevent an App from extending the class. Unfortunately,
`areNotificationsVisiblyDifferent(Style)` is both hidden and abstract.

The issue was not previously detected due to a bug in Metalava but that
has been fixed and so now this is an issue. This change is temporarily
suppressing the error in the code to unblock Metalava changes being
merged into AOSP but it should be fixed properly ASAP.

A proper fix would either require marking the public constructor as
`@removed` or unhiding the method or giving it a concrete
implementation.

Bug: 324468829
Test: m checkapi android-non-updatable-doc-stubs
(cherry picked from https://android-review.googlesource.com/q/commit:ddc69d098f03fce1bed20144f92b8743eddb1767)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:57f1c4e1e85a4593ec596af264cd644e2130a6cb)
Merged-In: I3b72ef4f0afff35771ee6f37130d1084071e2de1
Change-Id: I3b72ef4f0afff35771ee6f37130d1084071e2de1

Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main

Otherwise system_server incorrectly shows up in the uid_0 (root) cgroup
in the v2 hierarchy.

Change-Id: I6123b649dabd8c752e527c776d611f5899abfe2c
Bug: 326301963

This reverts commit f9bdb797.

Reason for revert: cherry picker placed the change in incorrect place

Merged-In: Ie2ee7578352463aa42942c0b42b78557c414fb52
Change-Id: Ifda8252249402d4452a9629c79950f177ba5d9f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2965342



Change-Id: Ice2c795ecde17d96abff28e1dda9126cb953d9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 206676167
Test: m

Change-Id: I914366f6cef19df5f528bb0a43b51d17b50ca1ae

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957974



Change-Id: I2a8f153a8fb24c4d2f202b963c5c7394d642311a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

The `Notification.Style` class is an abstract class with a publicly
visible constructor and so the assumption is it is expected to be
extended by Apps. As such it cannot have any hidden abstract methods as
that would prevent an App from extending the class. Unfortunately,
`areNotificationsVisiblyDifferent(Style)` is both hidden and abstract.

The issue was not previously detected due to a bug in Metalava but that
has been fixed and so now this is an issue. This change is temporarily
suppressing the error in the code to unblock Metalava changes being
merged into AOSP but it should be fixed properly ASAP.

A proper fix would either require marking the public constructor as
`@removed` or unhiding the method or giving it a concrete
implementation.

Bug: 324468829
Test: m checkapi android-non-updatable-doc-stubs
Change-Id: I3b72ef4f0afff35771ee6f37130d1084071e2de1

It makes sense to make people in INPUT_OWNERS owners of the file itself.

Bug: none
Test: none
Change-Id: Ia3fdfd4bb7a009abf8e9e17e37756987cd343ea8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2976055



Change-Id: I5558f57e0fe96b63c5d75609dc7eb7a3cd683f19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This is a follow up of aosp/2968526 which defered API changes.

Bug: 325886480
Change-Id: I2ccb86e71422d1d7f3cc7b34f08ccfe38be1b46b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2975131



Change-Id: I5af01eaf2fe1ea2c0c4409e358c813723cd4014c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Revert submission 2970571-turn-on-network-restrictions

Reason for revert: b/326370901

Reverted changes: /q/submissionid:2970571-turn-on-network-restrictions

Change-Id: I7f996f370791c83d781e7321344279823603c439

Allow the package install confirmation dialog to appear properly after
the user turns on unknown sources. Also fix an incorrect session ID
of -1 being shown in related log warnings.

"Finish PIA if UnknownSourcesListener would like to start a PIA again"
is a change that caused this feature to fail for third-party app stores.
This change resolves that issue.

Issue: calyxos#2081
Test: atest CtsPackageInstallTestCases
Test: Manual: Install a third-party app store e.g. F-Droid. Try to
install an app. Tap Settings on the prompt to configure unknown sources.
Tap to turn on unknown sources. The install confirmation dialog appears.

BUG: 326612529
Change-Id: Idd6667cbd79945d849b74a62122162ae72d99210

Fixes: 326293496
Test: build
Flag: NONE
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:94e44380a06e5b6c387160914537bbe2b1b7a384)
Merged-In: I22553d0b76b4b8b3decd90a38368ba5b53acc405
Change-Id: I22553d0b76b4b8b3decd90a38368ba5b53acc405

PermissionEntry.gids may return null when parsing legacy config trying
to work around an issue about upgrading from L platfrm. We can just
ignore such entries now.

Bug: 325137277
Bug: 322197421
Test: system boots with flag enabled
Change-Id: I71a160d53b1a1b429019bb1973a892f78ccb0a17
Merged-In: I71a160d53b1a1b429019bb1973a892f78ccb0a17
(cherry picked from commit b0b149c4)