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

Commit ce71447c authored by Patrick Plunkett's avatar Patrick Plunkett Committed by Android (Google) Code Review
Browse files

Merge "Allow ALLOCATE_AGGRESSIVE permission for... 

Merge "Allow ALLOCATE_AGGRESSIVE permission for StorageManagerService.getInternalStorageRemainingLifetime" into main
parents ec0916e7 b327a180

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

+0 −1
Original line number Diff line number Diff line
@@ -181,6 +181,5 @@ interface IStorageManager { 
     * device's useful lifetime remains. If no information is available, -1

     * is returned.

     */

    @EnforcePermission("READ_PRIVILEGED_PHONE_STATE")

    int getInternalStorageRemainingLifetime() = 99;

}

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

+9 −2
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.ParcelFileDescriptor;

import android.os.ParcelableException;

import android.os.PermissionEnforcer;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.RemoteCallbackList;
@@ -3653,10 +3654,16 @@ class StorageManagerService extends IStorageManager.Stub 
        return mInternalStorageSize;

    }



    @EnforcePermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @Override

    public int getInternalStorageRemainingLifetime() throws RemoteException {

        super.getInternalStorageRemainingLifetime_enforcePermission();

        PermissionEnforcer.fromContext(mContext)

            .enforcePermissionAnyOf(

                new String[] {

                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                    android.Manifest.permission.ALLOCATE_AGGRESSIVE

                },

                getCallingPid(),

                getCallingUid());

        return mVold.getStorageRemainingLifetime();

    }