summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Islam Elbanna <islamelbanna@google.com> 2024-12-13 04:46:21 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-12-13 04:46:21 -0800
commit2c421cc2ee668aa3b755833e2de5a1a25ea27b27 (patch)
tree85ba1d67efcaf8cbb2c0bf38e756e1ef2e707dd4
parent48fa532093ac705672c8c29399abc1f09e9be943 (diff)
parent1c82b116a84d9e121e8dee0a26e6668ac524f73a (diff)
Merge "Allow android.permission.PermissionManager to be initialized" into main
-rw-r--r--boot/preloaded-classes1
-rw-r--r--config/preloaded-classes1
-rw-r--r--config/preloaded-classes-denylist1
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