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

Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev

Browse Source 
am: 8039ac418f

Change-Id: I8c3575d974a5266b62d560508df1253ba80fb0e4
This commit is contained in:
Justin Klaassen
2017-08-09 17:59:04 +00:00
committed by android-build-merger
parent a8fdcd90c8 8039ac418f
commit afcdba9ef9
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import android.content.pm.PackageManagerInternal.SyncAdapterPackagesProvider;
import android.content.pm.PackageParser;
import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
@@ -701,6 +702,16 @@ final class DefaultPermissionGrantPolicy {
LOCATION_PERMISSIONS, true, userId);
}
// Ringtone Picker
Intent ringtonePickerIntent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
PackageParser.Package ringtonePickerPackage =
getDefaultSystemHandlerActivityPackageLPr(ringtonePickerIntent, userId);
if (ringtonePickerPackage != null
&& doesPackageSupportRuntimePermissions(ringtonePickerPackage)) {
grantRuntimePermissionsLPw(ringtonePickerPackage,
STORAGE_PERMISSIONS, true, userId);
}
mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);
}
}