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

Commit 41905759 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Delete @removed APIs that never shipped."

parents adcab823 dd9bda81

api/removed.txt

+0 −26
Original line number Diff line number Diff line
@@ -20,25 +20,14 @@ package android.app.admin { 
package android.content {



  public abstract class Context {

    method public deprecated android.content.Context createCredentialEncryptedStorageContext();

    method public deprecated android.content.Context createDeviceEncryptedStorageContext();

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public abstract java.io.File getSharedPreferencesPath(java.lang.String);

    method public deprecated boolean isCredentialEncryptedStorage();

    method public deprecated boolean isDeviceEncryptedStorage();

    method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);

    method public deprecated boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);

  }



}



package android.content.pm {



  public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public deprecated java.lang.String credentialEncryptedDataDir;

    field public deprecated java.lang.String deviceEncryptedDataDir;

  }



  public class ComponentInfo extends android.content.pm.PackageItemInfo {

    field public deprecated boolean encryptionAware;

  }
@@ -47,12 +36,6 @@ package android.content.pm { 
    field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1

  }



  public abstract class PackageManager {

    field public static final deprecated int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000

    field public static final deprecated int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000

    field public static final deprecated int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000

  }



}



package android.database {
@@ -186,15 +169,6 @@ package android.os.storage { 


}



package android.preference {



  public class PreferenceManager {

    method public deprecated void setStorageCredentialEncrypted();

    method public deprecated void setStorageDeviceEncrypted();

  }



}



package android.provider {



  public class Browser {

api/system-removed.txt

+0 −26
Original line number Diff line number Diff line
@@ -18,25 +18,14 @@ package android.app.admin { 
package android.content {



  public abstract class Context {

    method public deprecated android.content.Context createCredentialEncryptedStorageContext();

    method public deprecated android.content.Context createDeviceEncryptedStorageContext();

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public abstract java.io.File getSharedPreferencesPath(java.lang.String);

    method public deprecated boolean isCredentialEncryptedStorage();

    method public deprecated boolean isDeviceEncryptedStorage();

    method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);

    method public deprecated boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);

  }



}



package android.content.pm {



  public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public deprecated java.lang.String credentialEncryptedDataDir;

    field public deprecated java.lang.String deviceEncryptedDataDir;

  }



  public class ComponentInfo extends android.content.pm.PackageItemInfo {

    field public deprecated boolean encryptionAware;

  }
@@ -45,12 +34,6 @@ package android.content.pm { 
    field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1

  }



  public abstract class PackageManager {

    field public static final deprecated int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000

    field public static final deprecated int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000

    field public static final deprecated int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000

  }



}



package android.database {
@@ -180,15 +163,6 @@ package android.os.storage { 


}



package android.preference {



  public class PreferenceManager {

    method public deprecated void setStorageCredentialEncrypted();

    method public deprecated void setStorageDeviceEncrypted();

  }



}



package android.provider {



  public class Browser {

api/test-removed.txt

+0 −26
Original line number Diff line number Diff line
@@ -20,25 +20,14 @@ package android.app.admin { 
package android.content {



  public abstract class Context {

    method public deprecated android.content.Context createCredentialEncryptedStorageContext();

    method public deprecated android.content.Context createDeviceEncryptedStorageContext();

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public abstract java.io.File getSharedPreferencesPath(java.lang.String);

    method public deprecated boolean isCredentialEncryptedStorage();

    method public deprecated boolean isDeviceEncryptedStorage();

    method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);

    method public deprecated boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);

  }



}



package android.content.pm {



  public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public deprecated java.lang.String credentialEncryptedDataDir;

    field public deprecated java.lang.String deviceEncryptedDataDir;

  }



  public class ComponentInfo extends android.content.pm.PackageItemInfo {

    field public deprecated boolean encryptionAware;

  }
@@ -47,12 +36,6 @@ package android.content.pm { 
    field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1

  }



  public abstract class PackageManager {

    field public static final deprecated int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000

    field public static final deprecated int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000

    field public static final deprecated int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000

  }



}



package android.database {
@@ -186,15 +169,6 @@ package android.os.storage { 


}



package android.preference {



  public class PreferenceManager {

    method public deprecated void setStorageCredentialEncrypted();

    method public deprecated void setStorageDeviceEncrypted();

  }



}



package android.provider {



  public class Browser {

core/java/android/content/Context.java

+0 −36
Original line number Diff line number Diff line
@@ -730,12 +730,6 @@ public abstract class Context { 
     */

    public abstract boolean moveSharedPreferencesFrom(Context sourceContext, String name);



    /** @removed */

    @Deprecated

    public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {

        return moveSharedPreferencesFrom(sourceContext, name);

    }



    /**

     * Delete an existing shared preferences file.

     *
@@ -1451,12 +1445,6 @@ public abstract class Context { 
     */

    public abstract boolean moveDatabaseFrom(Context sourceContext, String name);



    /** @removed */

    @Deprecated

    public boolean migrateDatabaseFrom(Context sourceContext, String name) {

        return moveDatabaseFrom(sourceContext, name);

    }



    /**

     * Delete an existing private SQLiteDatabase associated with this Context's

     * application package.
@@ -4382,12 +4370,6 @@ public abstract class Context { 
     */

    public abstract Context createDeviceProtectedStorageContext();



    /** @removed */

    @Deprecated

    public Context createDeviceEncryptedStorageContext() {

        return createDeviceProtectedStorageContext();

    }



    /**

     * Return a new Context object for the current Context but whose storage

     * APIs are backed by credential-protected storage. This is the default
@@ -4416,12 +4398,6 @@ public abstract class Context { 
    @SystemApi

    public abstract Context createCredentialProtectedStorageContext();



    /** @removed */

    @Deprecated

    public Context createCredentialEncryptedStorageContext() {

        return createCredentialProtectedStorageContext();

    }



    /**

     * Gets the display adjustments holder for this context.  This information

     * is provided on a per-application or activity basis and is used to simulate lower density
@@ -4462,12 +4438,6 @@ public abstract class Context { 
     */

    public abstract boolean isDeviceProtectedStorage();



    /** @removed */

    @Deprecated

    public boolean isDeviceEncryptedStorage() {

        return isDeviceProtectedStorage();

    }



    /**

     * Indicates if the storage APIs of this Context are backed by

     * credential-protected storage.
@@ -4478,12 +4448,6 @@ public abstract class Context { 
    @SystemApi

    public abstract boolean isCredentialProtectedStorage();



    /** @removed */

    @Deprecated

    public boolean isCredentialEncryptedStorage() {

        return isCredentialProtectedStorage();

    }



    /**

     * @hide

     */

core/java/android/content/pm/ApplicationInfo.java

+6 −14
Original line number Diff line number Diff line
@@ -720,10 +720,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public String deviceProtectedDataDir;



    /** @removed */

    @Deprecated

    public String deviceEncryptedDataDir;



    /**

     * Full path to the credential-protected directory assigned to the package

     * for its persistent data.
@@ -733,10 +729,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    @SystemApi

    public String credentialProtectedDataDir;



    /** @removed */

    @Deprecated

    public String credentialEncryptedDataDir;



    /**

     * Full path to the directory where native JNI libraries are stored.

     */
@@ -1140,8 +1132,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        seInfoUser = orig.seInfoUser;

        sharedLibraryFiles = orig.sharedLibraryFiles;

        dataDir = orig.dataDir;

        deviceEncryptedDataDir = deviceProtectedDataDir = orig.deviceProtectedDataDir;

        credentialEncryptedDataDir = credentialProtectedDataDir = orig.credentialProtectedDataDir;

        deviceProtectedDataDir = orig.deviceProtectedDataDir;

        credentialProtectedDataDir = orig.credentialProtectedDataDir;

        uid = orig.uid;

        minSdkVersion = orig.minSdkVersion;

        targetSdkVersion = orig.targetSdkVersion;
@@ -1264,8 +1256,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        seInfoUser = source.readString();

        sharedLibraryFiles = source.readStringArray();

        dataDir = source.readString();

        deviceEncryptedDataDir = deviceProtectedDataDir = source.readString();

        credentialEncryptedDataDir = credentialProtectedDataDir = source.readString();

        deviceProtectedDataDir = source.readString();

        credentialProtectedDataDir = source.readString();

        uid = source.readInt();

        minSdkVersion = source.readInt();

        targetSdkVersion = source.readInt();
@@ -1336,10 +1328,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
            return;

        }



        deviceEncryptedDataDir = deviceProtectedDataDir = Environment

        deviceProtectedDataDir = Environment

                .getDataUserDePackageDirectory(volumeUuid, userId, packageName)

                .getAbsolutePath();

        credentialEncryptedDataDir = credentialProtectedDataDir = Environment

        credentialProtectedDataDir = Environment

                .getDataUserCePackageDirectory(volumeUuid, userId, packageName)

                .getAbsolutePath();