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

Merge "Make DefGrantPolicy always grant ALWAYS_LOCATION" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-18 21:43:42 +00:00
committed by Android (Google) Code Review
parent ec3ba99e95 88327e9790
commit 637600ce76
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,12 +143,6 @@ public final class DefaultPermissionGrantPolicy {
CONTACTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS); CONTACTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS);
} }
private static final Set<String> LOCATION_PERMISSIONS = new ArraySet<>();
static {
LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_FINE_LOCATION);
LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION);
}
private static final Set<String> ALWAYS_LOCATION_PERMISSIONS = new ArraySet<>(); private static final Set<String> ALWAYS_LOCATION_PERMISSIONS = new ArraySet<>();
static { static {
ALWAYS_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_FINE_LOCATION); ALWAYS_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_FINE_LOCATION);
@@ -453,7 +447,8 @@ public final class DefaultPermissionGrantPolicy {
// SetupWizard // SetupWizard
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
getKnownPackage(PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId), userId, getKnownPackage(PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId), userId,
PHONE_PERMISSIONS, CONTACTS_PERMISSIONS, LOCATION_PERMISSIONS, CAMERA_PERMISSIONS); PHONE_PERMISSIONS, CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
CAMERA_PERMISSIONS);
// Camera // Camera
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
@@ -585,7 +580,7 @@ public final class DefaultPermissionGrantPolicy {
// Maps // Maps
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
getDefaultSystemHandlerActivityPackageForCategory(Intent.CATEGORY_APP_MAPS, userId), getDefaultSystemHandlerActivityPackageForCategory(Intent.CATEGORY_APP_MAPS, userId),
userId, LOCATION_PERMISSIONS); userId, ALWAYS_LOCATION_PERMISSIONS);
// Gallery // Gallery
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
@@ -609,14 +604,14 @@ public final class DefaultPermissionGrantPolicy {
} }
} }
grantPermissionsToPackage(browserPackage, userId, false /* ignoreSystemPackage */, grantPermissionsToPackage(browserPackage, userId, false /* ignoreSystemPackage */,
true /*whitelistRestrictedPermissions*/, LOCATION_PERMISSIONS); true /*whitelistRestrictedPermissions*/, ALWAYS_LOCATION_PERMISSIONS);
// Voice interaction // Voice interaction
if (voiceInteractPackageNames != null) { if (voiceInteractPackageNames != null) {
for (String voiceInteractPackageName : voiceInteractPackageNames) { for (String voiceInteractPackageName : voiceInteractPackageNames) {
grantPermissionsToSystemPackage(voiceInteractPackageName, userId, grantPermissionsToSystemPackage(voiceInteractPackageName, userId,
CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS, CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS,
PHONE_PERMISSIONS, SMS_PERMISSIONS, LOCATION_PERMISSIONS); PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
} }
} }
@@ -625,7 +620,7 @@ public final class DefaultPermissionGrantPolicy {
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
getDefaultSystemHandlerActivityPackage( getDefaultSystemHandlerActivityPackage(
SearchManager.INTENT_ACTION_GLOBAL_SEARCH, userId), SearchManager.INTENT_ACTION_GLOBAL_SEARCH, userId),
userId, MICROPHONE_PERMISSIONS, LOCATION_PERMISSIONS); userId, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
} }
// Voice recognition // Voice recognition
@@ -667,7 +662,7 @@ public final class DefaultPermissionGrantPolicy {
.addCategory(Intent.CATEGORY_LAUNCHER_APP); .addCategory(Intent.CATEGORY_LAUNCHER_APP);
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
getDefaultSystemHandlerActivityPackage(homeIntent, userId), userId, getDefaultSystemHandlerActivityPackage(homeIntent, userId), userId,
LOCATION_PERMISSIONS); ALWAYS_LOCATION_PERMISSIONS);
// Watches // Watches
if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH, 0)) { if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH, 0)) {
@@ -676,18 +671,18 @@ public final class DefaultPermissionGrantPolicy {
String wearPackage = getDefaultSystemHandlerActivityPackageForCategory( String wearPackage = getDefaultSystemHandlerActivityPackageForCategory(
Intent.CATEGORY_HOME_MAIN, userId); Intent.CATEGORY_HOME_MAIN, userId);
grantPermissionsToSystemPackage(wearPackage, userId, grantPermissionsToSystemPackage(wearPackage, userId,
CONTACTS_PERMISSIONS, MICROPHONE_PERMISSIONS, LOCATION_PERMISSIONS); CONTACTS_PERMISSIONS, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
grantSystemFixedPermissionsToSystemPackage(wearPackage, userId, PHONE_PERMISSIONS); grantSystemFixedPermissionsToSystemPackage(wearPackage, userId, PHONE_PERMISSIONS);
// Fitness tracking on watches // Fitness tracking on watches
grantPermissionsToSystemPackage( grantPermissionsToSystemPackage(
getDefaultSystemHandlerActivityPackage(ACTION_TRACK, userId), userId, getDefaultSystemHandlerActivityPackage(ACTION_TRACK, userId), userId,
SENSORS_PERMISSIONS, LOCATION_PERMISSIONS); SENSORS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
} }
// Print Spooler // Print Spooler
grantSystemFixedPermissionsToSystemPackage(PrintManager.PRINT_SPOOLER_PACKAGE_NAME, userId, grantSystemFixedPermissionsToSystemPackage(PrintManager.PRINT_SPOOLER_PACKAGE_NAME, userId,
LOCATION_PERMISSIONS); ALWAYS_LOCATION_PERMISSIONS);
// EmergencyInfo // EmergencyInfo
grantSystemFixedPermissionsToSystemPackage( grantSystemFixedPermissionsToSystemPackage(
@@ -725,7 +720,7 @@ public final class DefaultPermissionGrantPolicy {
if (!TextUtils.isEmpty(textClassifierPackageName)) { if (!TextUtils.isEmpty(textClassifierPackageName)) {
grantPermissionsToSystemPackage(textClassifierPackageName, userId, grantPermissionsToSystemPackage(textClassifierPackageName, userId,
PHONE_PERMISSIONS, SMS_PERMISSIONS, CALENDAR_PERMISSIONS, PHONE_PERMISSIONS, SMS_PERMISSIONS, CALENDAR_PERMISSIONS,
LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS); ALWAYS_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);
} }
// Atthention Service // Atthention Service
@@ -835,7 +830,7 @@ public final class DefaultPermissionGrantPolicy {
} }
for (String packageName : packageNames) { for (String packageName : packageNames) {
grantPermissionsToSystemPackage(packageName, userId, grantPermissionsToSystemPackage(packageName, userId,
PHONE_PERMISSIONS, MICROPHONE_PERMISSIONS, LOCATION_PERMISSIONS, PHONE_PERMISSIONS, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
CAMERA_PERMISSIONS, CONTACTS_PERMISSIONS); CAMERA_PERMISSIONS, CONTACTS_PERMISSIONS);
} }
} }
@@ -850,7 +845,7 @@ public final class DefaultPermissionGrantPolicy {
// Grant these permissions as system-fixed, so that nobody can accidentally // Grant these permissions as system-fixed, so that nobody can accidentally
// break cellular data. // break cellular data.
grantSystemFixedPermissionsToSystemPackage(packageName, userId, grantSystemFixedPermissionsToSystemPackage(packageName, userId,
PHONE_PERMISSIONS, LOCATION_PERMISSIONS); PHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
} }
} }
@@ -864,7 +859,7 @@ public final class DefaultPermissionGrantPolicy {
PackageInfo pkg = getSystemPackageInfo(packageName); PackageInfo pkg = getSystemPackageInfo(packageName);
if (isSystemPackage(pkg) && doesPackageSupportRuntimePermissions(pkg)) { if (isSystemPackage(pkg) && doesPackageSupportRuntimePermissions(pkg)) {
revokeRuntimePermissions(packageName, PHONE_PERMISSIONS, true, userId); revokeRuntimePermissions(packageName, PHONE_PERMISSIONS, true, userId);
revokeRuntimePermissions(packageName, LOCATION_PERMISSIONS, true, userId); revokeRuntimePermissions(packageName, ALWAYS_LOCATION_PERMISSIONS, true, userId);
} }
} }
} }
@@ -889,7 +884,7 @@ public final class DefaultPermissionGrantPolicy {
public void grantDefaultPermissionsToDefaultBrowser(String packageName, int userId) { public void grantDefaultPermissionsToDefaultBrowser(String packageName, int userId) {
Log.i(TAG, "Granting permissions to default browser for user:" + userId); Log.i(TAG, "Granting permissions to default browser for user:" + userId);
grantPermissionsToSystemPackage(packageName, userId, LOCATION_PERMISSIONS); grantPermissionsToSystemPackage(packageName, userId, ALWAYS_LOCATION_PERMISSIONS);
} }
private String getDefaultSystemHandlerActivityPackage(String intentAction, int userId) { private String getDefaultSystemHandlerActivityPackage(String intentAction, int userId) {