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

Commit e682791c authored by Daniel Jacob Chittoor's avatar Daniel Jacob Chittoor
Browse files

Merge branch '858-t-remove_ims_stubs' into 'v1-t' 

Revert redundant ImsService patches

See merge request e/os/android_frameworks_base!184
parents 3a006cb4 b20b219b

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -32582,7 +32582,6 @@ package android.os.storage { 
    method @NonNull public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_EXTERNAL_STORAGE) public java.util.List<android.os.storage.StorageVolume> getStorageVolumesIncludingSharedProfiles();

    method @NonNull public java.util.UUID getUuidForPath(@NonNull java.io.File) throws java.io.IOException;

    method public static boolean inCryptKeeperBounce();

    method public boolean isAllocationSupported(@NonNull java.io.FileDescriptor);

    method public boolean isCacheBehaviorGroup(java.io.File) throws java.io.IOException;

    method public boolean isCacheBehaviorTombstone(java.io.File) throws java.io.IOException;

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

+0 −4
Original line number Diff line number Diff line
@@ -1693,10 +1693,6 @@ public class StorageManager { 
        return RoSystemProperties.CRYPTO_ENCRYPTED;

    }



    public static boolean inCryptKeeperBounce() {

        return false;

    }



    /** {@hide}

     * Is this device file encrypted?

     * @return true for file encrypted. (Implies isEncrypted() == true)