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

Commit 450c8a7e authored by David Anderson's avatar David Anderson Committed by Android (Google) Code Review
Browse files

Merge "Add storage health API for DeviceDiagnostics." into main

parents 243ef567 ce3f9f91

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11173,6 +11173,7 @@ package android.os.storage { 
    method @WorkerThread public void allocateBytes(java.io.FileDescriptor, long, @RequiresPermission int) throws java.io.IOException;

    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 @FlaggedApi("android.os.storage_lifetime_api") @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getInternalStorageRemainingLifetime();

    method public static boolean hasIsolatedStorage();

    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

core/java/android/os/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -114,3 +114,11 @@ flag { 
    is_fixed_read_only: true

    bug: "309792384"

}



flag {

    name: "storage_lifetime_api"

    namespace: "phoenix"

    description: "Feature flag for adding storage component health APIs."

    is_fixed_read_only: true

    bug: "309792384"

}

core/java/android/os/storage/IStorageManager.aidl

+9 −1
Original line number Diff line number Diff line
@@ -175,4 +175,12 @@ interface IStorageManager { 
    void setCloudMediaProvider(in String authority) = 96;

    String getCloudMediaProvider() = 97;

    long getInternalStorageBlockDeviceSize() = 98;

    /**

     * Returns the remaining lifetime of the internal storage device, as an

     * integer percentage. For example, 90 indicates that 90% of the storage

     * device's useful lifetime remains. If no information is available, -1

     * is returned.

     */

    @EnforcePermission("READ_PRIVILEGED_PHONE_STATE")

    int getInternalStorageRemainingLifetime() = 99;

}

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

+22 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.os.UserHandle.PER_USER_RANGE; 


import android.annotation.BytesLong;

import android.annotation.CallbackExecutor;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -58,6 +59,7 @@ import android.os.Binder; 
import android.os.Build;

import android.os.Environment;

import android.os.FileUtils;

import android.os.Flags;

import android.os.Handler;

import android.os.IInstalld;

import android.os.IVold;
@@ -2939,4 +2941,24 @@ public class StorageManager { 
    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int CRYPT_TYPE_DEFAULT = 1;



    /**

     * Returns the remaining lifetime of the internal storage device, as an integer percentage. For

     * example, 90 indicates that 90% of the storage device's useful lifetime remains. If no

     * information is available, -1 is returned.

     *

     * @return Percentage of the remaining useful lifetime of the internal storage device.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_STORAGE_LIFETIME_API)

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public int getInternalStorageRemainingLifetime() {

        try {

            return mStorageManager.getInternalStorageRemainingLifetime();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}

services/core/java/com/android/server/StorageManagerService.java

+8 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static com.android.internal.util.XmlUtils.writeStringAttribute; 
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;

import static org.xmlpull.v1.XmlPullParser.START_TAG;



import android.annotation.EnforcePermission;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;
@@ -3597,6 +3598,13 @@ class StorageManagerService extends IStorageManager.Stub 
        return mInternalStorageSize;

    }



    @EnforcePermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @Override

    public int getInternalStorageRemainingLifetime() throws RemoteException {

        super.getInternalStorageRemainingLifetime_enforcePermission();

        return mVold.getStorageRemainingLifetime();

    }



    /**

     * Enforces that the caller is the {@link ExternalStorageService}

     *