drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev

Browse Source 
am: 54c3808802

* commit '54c3808802e643785cc76b29067d1119e9c78af4':
  Grant fixed SMS & Phone permission to package handling the twinning settings intent.
This commit is contained in:
Pierre-Laurent Coirier
2016-03-02 18:53:21 +00:00
committed by android-build-merger
parent 21c47d1b22 54c3808802
commit 0048acfc16
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,9 @@ final class DefaultPermissionGrantPolicy {
STORAGE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE); 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 final PackageManagerService mService;
private PackagesProvider mImePackagesProvider; private PackagesProvider mImePackagesProvider;
@ -571,8 +574,9 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId); grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);
} }
// Android Wear Home // Android Wear
if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH)) { if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
// Android Wear Home
Intent homeIntent = new Intent(Intent.ACTION_MAIN); Intent homeIntent = new Intent(Intent.ACTION_MAIN);
homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN); homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
@ -589,6 +593,17 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false, grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false,
userId); 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); mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);