summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pierre-Laurent Coirier <plcoirier@google.com> 2016-02-26 12:07:41 -0500
committer Pierre-Laurent Coirier <plcoirier@google.com> 2016-02-26 15:37:25 -0500
commit7b09ab84309bdcd343c4bb5c66ca6a427e72d1d0 (patch)
treeeb891d444068a8a0c5f1c356576bb358e458f14d
parentdcd0b05dc35fb058f89a16d370bb7965b339c1c5 (diff)
Grant fixed SMS & Phone permission to package handling the twinning
settings intent. BUG: 27343350 Change-Id: I818424e94006910dc25bab7cccb24f7979c39c9e
-rw-r--r--services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 8abc8fcd3009..ac99c2b5c28b 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -119,6 +119,9 @@ final class DefaultPermissionGrantPolicy {
STORAGE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
}
+ private static final String ACTION_TWINNING =
+ "com.google.android.clockwork.intent.TWINNING_SETTINGS";
+
private final PackageManagerService mService;
private PackagesProvider mImePackagesProvider;
@@ -571,8 +574,9 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);
}
- // Android Wear Home
+ // Android Wear
if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+ // Android Wear Home
Intent homeIntent = new Intent(Intent.ACTION_MAIN);
homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
@@ -589,6 +593,17 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false,
userId);
}
+
+ // AT&T NumberSync
+ Intent twinningIntent = new Intent(ACTION_TWINNING);
+ PackageParser.Package twinningPackage = getDefaultSystemHandlerActivityPackageLPr(
+ twinningIntent, userId);
+
+ if (twinningPackage != null
+ && doesPackageSupportRuntimePermissions(twinningPackage)) {
+ grantRuntimePermissionsLPw(twinningPackage, PHONE_PERMISSIONS, false, userId);
+ grantRuntimePermissionsLPw(twinningPackage, SMS_PERMISSIONS, false, userId);
+ }
}
mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);