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

Commit 2ea404fd authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Method to determine isolated storage mode."

parents db58c205 10ec9d8a

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -943,6 +943,10 @@ package android.os.health { 


package android.os.storage {



  public class StorageManager {

    method public static boolean hasIsolatedStorage();

  }



  public final class StorageVolume implements android.os.Parcelable {

    method public java.lang.String getPath();

  }

core/java/android/content/ContentResolver.java

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ public abstract class ContentResolver { 
     *

     * @hide

     */

    public static final boolean DEPRECATE_DATA_COLUMNS = SystemProperties

            .getBoolean(StorageManager.PROP_ISOLATED_STORAGE, false);

    public static final boolean DEPRECATE_DATA_COLUMNS = StorageManager.hasIsolatedStorage();



    /**

     * Special filesystem path prefix which indicates that a path should be

core/java/android/content/pm/PackageParser.java

+1 −1
Original line number Diff line number Diff line
@@ -2513,7 +2513,7 @@ public class PackageParser { 
        // If the storage model feature flag is disabled, we need to fiddle

        // around with permission definitions to return us to pre-Q behavior.

        // STOPSHIP(b/112545973): remove once feature enabled by default

        if (!SystemProperties.getBoolean(StorageManager.PROP_ISOLATED_STORAGE, false)) {

        if (!StorageManager.hasIsolatedStorage()) {

            if ("android".equals(pkg.packageName)) {

                final ArraySet<String> newGroups = new ArraySet<>();

                newGroups.add(android.Manifest.permission_group.MEDIA_AURAL);

core/java/android/os/storage/StorageManager.java

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.SdkConstant; 
import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.annotation.WorkerThread;

import android.app.Activity;
@@ -1533,6 +1534,12 @@ public class StorageManager { 
        return SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false);

    }



    /** {@hide} */

    @TestApi

    public static boolean hasIsolatedStorage() {

        return SystemProperties.getBoolean(PROP_ISOLATED_STORAGE, false);

    }



    /**

     * @deprecated disabled now that FUSE has been replaced by sdcardfs

     * @hide

core/java/com/android/server/SystemConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ public class SystemConfig { 
        // If the storage model feature flag is disabled, we need to fiddle

        // around with permission definitions to return us to pre-Q behavior.

        // STOPSHIP(b/112545973): remove once feature enabled by default

        if (!SystemProperties.getBoolean(StorageManager.PROP_ISOLATED_STORAGE, false)) {

        if (!StorageManager.hasIsolatedStorage()) {

            if (newPermissions.contains(android.Manifest.permission.READ_MEDIA_AUDIO) ||

                    newPermissions.contains(android.Manifest.permission.READ_MEDIA_VIDEO) ||

                    newPermissions.contains(android.Manifest.permission.READ_MEDIA_IMAGES)) {