diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 07e05c6a830e6..2a9e60a469725 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1914,6 +1914,10 @@ --> com.android.captiveportallogin + + + + + + diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 0ae92b4ee8460..32ee21cf16588 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -616,6 +616,10 @@ final class DefaultPermissionGrantPolicy { grantPermissionsToSystemPackage(pm, getDefaultCaptivePortalLoginPackage(), userId, NOTIFICATION_PERMISSIONS); + // Dock Manager + grantPermissionsToSystemPackage(pm, getDefaultDockManagerPackage(), userId, + NOTIFICATION_PERMISSIONS); + // Camera grantPermissionsToSystemPackage(pm, getDefaultSystemHandlerActivityPackage(pm, MediaStore.ACTION_IMAGE_CAPTURE, userId), @@ -932,6 +936,10 @@ final class DefaultPermissionGrantPolicy { return mContext.getString(R.string.config_defaultCaptivePortalLoginPackageName); } + private String getDefaultDockManagerPackage() { + return mContext.getString(R.string.config_defaultDockManagerPackageName); + } + @SafeVarargs private final void grantPermissionToEachSystemPackage(PackageManagerWrapper pm, ArrayList packages, int userId, Set... permissions) {