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

Revert "Fixing Storage Volume listing for Cloned User."

Browse Source 
Revert submission 20517233-Cloned User Storage Issue-tm-qpr-dev

Reason for revert: “DroidMonitor: Potential culprit for Bug 261921307 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”
Reverted Changes:
I6835cc4d2:Fixing Storage Volume(s) Retrieval.
I617bae9b2:Fixing Storage Volume listing for Cloned User.

Change-Id: I08722e8467fafa53ab914ec5de0380d2df62b55d
This commit is contained in:
Arc Wang
2022-12-09 02:12:08 +00:00
parent 2616b20e7a
commit 4736afef80
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -10003,7 +10003,7 @@ package android.os.storage {
method @WorkerThread public long getAllocatableBytes(@NonNull java.util.UUID, @RequiresPermission int) throws java.io.IOException;
method @RequiresPermission(android.Manifest.permission.WRITE_MEDIA_STORAGE) public int getExternalStorageMountMode(int, @NonNull String);
method public static boolean hasIsolatedStorage();
method @RequiresPermission(android.Manifest.permission.MANAGE_EXTERNAL_STORAGE) public void updateExternalStorageFileQuotaType(@NonNull java.io.File, int) throws java.io.IOException;
method public void updateExternalStorageFileQuotaType(@NonNull java.io.File, int) throws java.io.IOException;
field @RequiresPermission(android.Manifest.permission.ALLOCATE_AGGRESSIVE) public static final int FLAG_ALLOCATE_AGGRESSIVE = 1; // 0x1
field public static final int MOUNT_MODE_EXTERNAL_ANDROID_WRITABLE = 4; // 0x4
field public static final int MOUNT_MODE_EXTERNAL_DEFAULT = 1; // 0x1

9
core/java/android/os/storage/StorageManager.java
View File

@@ -2552,7 +2552,7 @@ public class StorageManager {
* called on first creation of a new file on external storage, and whenever the
* media type of the file is updated later.
*
* This API requires MANAGE_EXTERNAL_STORAGE permission and typical implementations
* This API doesn't require any special permissions, though typical implementations
* will require being called from an SELinux domain that allows setting file attributes
* related to quota (eg the GID or project ID).
*
@@ -2571,16 +2571,11 @@ public class StorageManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MANAGE_EXTERNAL_STORAGE)
public void updateExternalStorageFileQuotaType(@NonNull File path,
@QuotaType int quotaType) throws IOException {
long projectId;
final String filePath = path.getCanonicalPath();
// MANAGE_EXTERNAL_STORAGE permission is required as FLAG_INCLUDE_SHARED_PROFILE is being
// set while querying getVolumeList.
final StorageVolume[] availableVolumes = getVolumeList(mContext.getUserId(),
FLAG_REAL_STATE | FLAG_INCLUDE_INVISIBLE | FLAG_INCLUDE_SHARED_PROFILE);
final StorageVolume volume = getStorageVolume(availableVolumes, path);
final StorageVolume volume = getStorageVolume(path);
if (volume == null) {
Log.w(TAG, "Failed to update quota type for " + filePath);
return;