diff options
| author | 2024-12-13 11:50:43 -0800 | |
|---|---|---|
| committer | 2024-12-13 11:50:43 -0800 | |
| commit | e87fe421c5ed368d92f04d382896145f5db76ee0 (patch) | |
| tree | 0d402978c19164c51d524841353dda80b2c0f6b2 | |
| parent | 68a09e68f07ba88c413660d3298e3414314579a6 (diff) | |
| parent | 2c421cc2ee668aa3b755833e2de5a1a25ea27b27 (diff) | |
Merge "Allow android.permission.PermissionManager to be initialized" into main am: 2c421cc2ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3407348
Change-Id: Ifd1e907a32d2b5c369817103b846a963bee0d34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | boot/preloaded-classes | 1 | ||||
| -rw-r--r-- | config/preloaded-classes | 1 | ||||
| -rw-r--r-- | config/preloaded-classes-denylist | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/boot/preloaded-classes b/boot/preloaded-classes index afd9984cb124..b83bd4e4d401 100644 --- a/boot/preloaded-classes +++ b/boot/preloaded-classes @@ -6583,6 +6583,7 @@ android.permission.LegacyPermissionManager android.permission.PermissionCheckerManager android.permission.PermissionControllerManager$1 android.permission.PermissionControllerManager +android.permission.PermissionManager android.permission.PermissionManager$1 android.permission.PermissionManager$2 android.permission.PermissionManager$OnPermissionsChangeListenerDelegate diff --git a/config/preloaded-classes b/config/preloaded-classes index 343de0bf3b98..e53c78f65877 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -6587,6 +6587,7 @@ android.permission.LegacyPermissionManager android.permission.PermissionCheckerManager android.permission.PermissionControllerManager$1 android.permission.PermissionControllerManager +android.permission.PermissionManager android.permission.PermissionManager$1 android.permission.PermissionManager$2 android.permission.PermissionManager$OnPermissionsChangeListenerDelegate diff --git a/config/preloaded-classes-denylist b/config/preloaded-classes-denylist index 16f069394639..e3e929cb00d9 100644 --- a/config/preloaded-classes-denylist +++ b/config/preloaded-classes-denylist @@ -3,7 +3,6 @@ android.media.MediaCodecInfo$CodecCapabilities$FeatureList android.net.ConnectivityThread$Singleton android.os.FileObserver android.os.NullVibrator -android.permission.PermissionManager android.provider.MediaStore android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask android.view.HdrRenderState |