Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5bf6f14 authored by Justin Klaassen's avatar Justin Klaassen Committed by android-build-merger
Browse files

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

am: 8039ac41

Change-Id: Id788315e6ad9a5fe72287fb922c77d7df03ea82b
parents 28cc38c4 8039ac41
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -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);
        }
    }