Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add default pregrant permission for Dock Manager." into tm-qpr-dev

Browse Source
This commit is contained in:
Jorge De la Torre
2022-11-13 22:04:20 +00:00
committed by Android (Google) Code Review
parent db45ef8514 100d13aa05
commit 23cb3a7f03
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -1914,6 +1914,10 @@
--> -->
<string name="config_defaultCaptivePortalLoginPackageName" translatable="false">com.android.captiveportallogin</string> <string name="config_defaultCaptivePortalLoginPackageName" translatable="false">com.android.captiveportallogin</string>
<!-- The package name of the dock manager app. Must be granted the
POST_NOTIFICATIONS permission. -->
<string name="config_defaultDockManagerPackageName" translatable="false"></string>
<!-- Whether to enable geocoder overlay which allows geocoder to be replaced <!-- Whether to enable geocoder overlay which allows geocoder to be replaced
by an app at run-time. When disabled, only the by an app at run-time. When disabled, only the
config_geocoderProviderPackageName package will be searched for config_geocoderProviderPackageName package will be searched for

3
core/res/res/values/symbols.xml
View File

@@ -3466,6 +3466,9 @@
<!-- Captive Portal Login --> <!-- Captive Portal Login -->
<java-symbol type="string" name="config_defaultCaptivePortalLoginPackageName" /> <java-symbol type="string" name="config_defaultCaptivePortalLoginPackageName" />
<!-- Dock Manager -->
<java-symbol type="string" name="config_defaultDockManagerPackageName" />
<!-- Optional IPsec algorithms --> <!-- Optional IPsec algorithms -->
<java-symbol type="array" name="config_optionalIpSecAlgorithms" /> <java-symbol type="array" name="config_optionalIpSecAlgorithms" />

8
services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
View File

@@ -616,6 +616,10 @@ final class DefaultPermissionGrantPolicy {
grantPermissionsToSystemPackage(pm, getDefaultCaptivePortalLoginPackage(), userId, grantPermissionsToSystemPackage(pm, getDefaultCaptivePortalLoginPackage(), userId,
NOTIFICATION_PERMISSIONS); NOTIFICATION_PERMISSIONS);
// Dock Manager
grantPermissionsToSystemPackage(pm, getDefaultDockManagerPackage(), userId,
NOTIFICATION_PERMISSIONS);
// Camera // Camera
grantPermissionsToSystemPackage(pm, grantPermissionsToSystemPackage(pm,
getDefaultSystemHandlerActivityPackage(pm, MediaStore.ACTION_IMAGE_CAPTURE, userId), getDefaultSystemHandlerActivityPackage(pm, MediaStore.ACTION_IMAGE_CAPTURE, userId),
@@ -932,6 +936,10 @@ final class DefaultPermissionGrantPolicy {
return mContext.getString(R.string.config_defaultCaptivePortalLoginPackageName); return mContext.getString(R.string.config_defaultCaptivePortalLoginPackageName);
} }
private String getDefaultDockManagerPackage() {
return mContext.getString(R.string.config_defaultDockManagerPackageName);
}
@SafeVarargs @SafeVarargs
private final void grantPermissionToEachSystemPackage(PackageManagerWrapper pm, private final void grantPermissionToEachSystemPackage(PackageManagerWrapper pm,
ArrayList<String> packages, int userId, Set<String>... permissions) { ArrayList<String> packages, int userId, Set<String>... permissions) {