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

Merge "Add Default grant for Captive Portal Login app" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-12 17:40:10 +00:00
committed by Android (Google) Code Review
parent db6650eb07 3eac0ae59a
commit 5f951629d3
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1869,6 +1869,11 @@
--> -->
<string name="config_defaultSearchSelectorPackageName" translatable="false"></string> <string name="config_defaultSearchSelectorPackageName" translatable="false"></string>
<!-- The package name of the default captive portal login app. Must be granted the
POST_NOTIFICATIONS permission.
-->
<string name="config_defaultCaptivePortalLoginPackageName" 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

@@ -3419,6 +3419,9 @@
<!-- Search Selector --> <!-- Search Selector -->
<java-symbol type="string" name="config_defaultSearchSelectorPackageName" /> <java-symbol type="string" name="config_defaultSearchSelectorPackageName" />
<!-- Captive Portal Login -->
<java-symbol type="string" name="config_defaultCaptivePortalLoginPackageName" />
<!-- 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

@@ -618,6 +618,10 @@ final class DefaultPermissionGrantPolicy {
grantPermissionsToSystemPackage(pm, getDefaultSearchSelectorPackage(), userId, grantPermissionsToSystemPackage(pm, getDefaultSearchSelectorPackage(), userId,
NOTIFICATION_PERMISSIONS); NOTIFICATION_PERMISSIONS);
// Captive Portal Login
grantPermissionsToSystemPackage(pm, getDefaultCaptivePortalLoginPackage(), userId,
NOTIFICATION_PERMISSIONS);
// Camera // Camera
grantPermissionsToSystemPackage(pm, grantPermissionsToSystemPackage(pm,
getDefaultSystemHandlerActivityPackage(pm, MediaStore.ACTION_IMAGE_CAPTURE, userId), getDefaultSystemHandlerActivityPackage(pm, MediaStore.ACTION_IMAGE_CAPTURE, userId),
@@ -933,6 +937,10 @@ final class DefaultPermissionGrantPolicy {
return mContext.getString(R.string.config_defaultSearchSelectorPackageName); return mContext.getString(R.string.config_defaultSearchSelectorPackageName);
} }
private String getDefaultCaptivePortalLoginPackage() {
return mContext.getString(R.string.config_defaultCaptivePortalLoginPackageName);
}
@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) {