diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-14 15:06:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-14 15:06:16 +0000 |
| commit | b045331fcb033507072bfd7899a147bb2be7176e (patch) | |
| tree | f6d55b8b68eb3f8583bae6e06de16e4438b979c6 /services | |
| parent | cfcf6af915bee878bdaea04f48592bbbe506ad26 (diff) | |
| parent | 52153f4c0540a991b5b7214f4f14b5a891479a3c (diff) | |
| download | frameworks_base-b045331fcb033507072bfd7899a147bb2be7176e.zip frameworks_base-b045331fcb033507072bfd7899a147bb2be7176e.tar.gz frameworks_base-b045331fcb033507072bfd7899a147bb2be7176e.tar.bz2 | |
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
Diffstat (limited to 'services')
3 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java index c13401f..b766894 100644 --- a/services/core/java/com/android/server/content/ContentService.java +++ b/services/core/java/com/android/server/content/ContentService.java @@ -157,7 +157,7 @@ public final class ContentService extends IContentService.Stub { mFactoryTest = factoryTest; // Let the package manager query for the sync adapters for a given authority - // as we grant default permissions to sync adapters for specifix authorities. + // as we grant default permissions to sync adapters for specific authorities. PackageManagerInternal packageManagerInternal = LocalServices.getService( PackageManagerInternal.class); packageManagerInternal.setSyncAdapterPackagesprovider( diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index 71a2d59..d2a70df 100644 --- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java @@ -296,7 +296,7 @@ final class DefaultPermissionGrantPolicy { PackageParser.Package storagePackage = getDefaultProviderAuthorityPackageLPr( "com.android.externalstorage.documents", userId); if (storagePackage != null) { - grantRuntimePermissionsLPw(storagePackage, STORAGE_PERMISSIONS, userId); + grantRuntimePermissionsLPw(storagePackage, STORAGE_PERMISSIONS, true, userId); } // CertInstaller @@ -360,7 +360,7 @@ final class DefaultPermissionGrantPolicy { PackageParser.Package cbrPackage = getDefaultSystemHandlerActivityPackageLPr(cbrIntent, userId); if (cbrPackage != null && doesPackageSupportRuntimePermissions(cbrPackage)) { - grantRuntimePermissionsLPw(cbrPackage, SMS_PERMISSIONS, false, userId); + grantRuntimePermissionsLPw(cbrPackage, SMS_PERMISSIONS, userId); } // Calendar diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 00d0fe1..7dc04de 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -4151,7 +4151,7 @@ final class Settings { pw.print(", COSTS_MONEY"); } if ((perm.info.flags&PermissionInfo.FLAG_HIDDEN) != 0) { - pw.print(", COSTS_HIDDEN"); + pw.print(", HIDDEN"); } if ((perm.info.flags&PermissionInfo.FLAG_INSTALLED) != 0) { pw.print(", INSTALLED"); |