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

Commit bf2ca6d4 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Delete @removed-at-birth storage APIs" into main

parents 24b64e64 f552b8fe
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -30,20 +30,6 @@ package android.app {

}

package android.app.usage {

  public class StorageStatsManager {
    method @Deprecated public long getFreeBytes(String) throws java.io.IOException;
    method @Deprecated public long getTotalBytes(String) throws java.io.IOException;
    method @Deprecated public boolean isQuotaSupported(String);
    method @Deprecated public android.app.usage.ExternalStorageStats queryExternalStatsForUser(String, android.os.UserHandle) throws java.io.IOException;
    method @Deprecated public android.app.usage.StorageStats queryStatsForPackage(String, String, android.os.UserHandle) throws java.io.IOException, android.content.pm.PackageManager.NameNotFoundException;
    method @Deprecated public android.app.usage.StorageStats queryStatsForUid(String, int) throws java.io.IOException;
    method @Deprecated public android.app.usage.StorageStats queryStatsForUser(String, android.os.UserHandle) throws java.io.IOException;
  }

}

package android.content {

  public abstract class ContentProvider implements android.content.ComponentCallbacks2 {
+7 −9
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import android.os.UserHandle;
import android.os.storage.CrateInfo;
import android.os.storage.StorageManager;

import com.android.internal.util.Preconditions;

import java.io.File;
import java.io.IOException;
import java.util.Collection;
@@ -77,7 +75,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public boolean isQuotaSupported(String uuid) {
        return isQuotaSupported(convert(uuid));
@@ -120,7 +118,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public long getTotalBytes(String uuid) throws IOException {
        return getTotalBytes(convert(uuid));
@@ -152,7 +150,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public long getFreeBytes(String uuid) throws IOException {
        return getFreeBytes(convert(uuid));
@@ -221,7 +219,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public StorageStats queryStatsForPackage(String uuid, String packageName,
            UserHandle user) throws PackageManager.NameNotFoundException, IOException {
@@ -262,7 +260,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public StorageStats queryStatsForUid(String uuid, int uid) throws IOException {
        return queryStatsForUid(convert(uuid), uid);
@@ -300,7 +298,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public StorageStats queryStatsForUser(String uuid, UserHandle user) throws IOException {
        return queryStatsForUser(convert(uuid), user);
@@ -337,7 +335,7 @@ public class StorageStatsManager {
        }
    }

    /** @removed */
    /** {@hide} */
    @Deprecated
    public ExternalStorageStats queryExternalStatsForUser(String uuid, UserHandle user)
            throws IOException {