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

Merge "Rename Environment method to follow attribute." into qt-dev

Browse Source 
am: 16641365aa

Change-Id: I9b1ad00e1b4a29323a9ba9361487cedc3738b851
This commit is contained in:
Jeff Sharkey
2019-04-24 15:49:15 -07:00
committed by android-build-merger
parent 4d8a54e1be 16641365aa
commit 7a572d932f
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -34415,10 +34415,10 @@ package android.os {
method @Deprecated public static String getStorageState(java.io.File);
method public static boolean isExternalStorageEmulated();
method public static boolean isExternalStorageEmulated(@NonNull java.io.File);
method public static boolean isExternalStorageLegacy();
method public static boolean isExternalStorageLegacy(@NonNull java.io.File);
method public static boolean isExternalStorageRemovable();
method public static boolean isExternalStorageRemovable(@NonNull java.io.File);
method public static boolean isExternalStorageSandboxed();
method public static boolean isExternalStorageSandboxed(@NonNull java.io.File);
field public static String DIRECTORY_ALARMS;
field public static String DIRECTORY_AUDIOBOOKS;
field public static String DIRECTORY_DCIM;

30
core/java/android/os/Environment.java
View File

@@ -1115,42 +1115,42 @@ public class Environment {
}
/**
* Returns whether the shared/external storage media at the given path is a
* sandboxed view that only contains files owned by the app.
* Returns whether the primary shared/external storage media is a legacy
* view that includes files not owned by the app.
* <p>
* This value may be different from the value requested by
* {@code allowExternalStorageSandbox} in the app's manifest, since an app
* may inherit its sandboxed state based on when it was first installed.
* {@code requestLegacyExternalStorage} in the app's manifest, since an app
* may inherit its legacy state based on when it was first installed.
* <p>
* Sandboxed apps can continue to discover and read media belonging to other
* apps via {@link android.provider.MediaStore}.
* Non-legacy apps can continue to discover and read media belonging to
* other apps via {@link android.provider.MediaStore}.
*/
public static boolean isExternalStorageSandboxed() {
public static boolean isExternalStorageLegacy() {
final File externalDir = sCurrentUser.getExternalDirs()[0];
return isExternalStorageSandboxed(externalDir);
return isExternalStorageLegacy(externalDir);
}
/**
* Returns whether the shared/external storage media at the given path is a
* sandboxed view that only contains files owned by the app.
* legacy view that includes files not owned by the app.
* <p>
* This value may be different from the value requested by
* {@code allowExternalStorageSandbox} in the app's manifest, since an app
* may inherit its sandboxed state based on when it was first installed.
* {@code requestLegacyExternalStorage} in the app's manifest, since an app
* may inherit its legacy state based on when it was first installed.
* <p>
* Sandboxed apps can continue to discover and read media belonging to other
* apps via {@link android.provider.MediaStore}.
* Non-legacy apps can continue to discover and read media belonging to
* other apps via {@link android.provider.MediaStore}.
*
* @throws IllegalArgumentException if the path is not a valid storage
* device.
*/
public static boolean isExternalStorageSandboxed(@NonNull File path) {
public static boolean isExternalStorageLegacy(@NonNull File path) {
final Context context = AppGlobals.getInitialApplication();
final AppOpsManager appOps = context.getSystemService(AppOpsManager.class);
return appOps.checkOpNoThrow(AppOpsManager.OP_LEGACY_STORAGE,
context.getApplicationInfo().uid,
context.getOpPackageName()) != AppOpsManager.MODE_ALLOWED;
context.getOpPackageName()) == AppOpsManager.MODE_ALLOWED;
}
static File getDirectory(String variableName, String defaultPath) {