From dd9bda81f698043a0110d4e2178d20cb160ba829 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 23 Feb 2017 17:38:31 -0700 Subject: [PATCH] Delete @removed APIs that never shipped. These were never part of any public API level, so apps should never have been using them. Test: builds, boots Bug: 31241513 Change-Id: I4fc8f5c325da56694a5db98acc995a22d4947805 --- api/removed.txt | 26 -------------- api/system-removed.txt | 26 -------------- api/test-removed.txt | 26 -------------- core/java/android/content/Context.java | 36 ------------------- .../android/content/pm/ApplicationInfo.java | 20 ++++------- .../android/content/pm/PackageManager.java | 11 ------ .../android/preference/PreferenceManager.java | 12 ------- .../systemui/qs/external/CustomTile.java | 2 +- .../android/server/pm/PackageParserTest.java | 2 -- 9 files changed, 7 insertions(+), 154 deletions(-) diff --git a/api/removed.txt b/api/removed.txt index e4678113d08f8..23912988a13ef 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -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 { @@ -190,15 +173,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 { diff --git a/api/system-removed.txt b/api/system-removed.txt index 677311288a5c5..eb8493a600b3e 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -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 { @@ -184,15 +167,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 { diff --git a/api/test-removed.txt b/api/test-removed.txt index e4678113d08f8..23912988a13ef 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -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 { @@ -190,15 +173,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 { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 44f6c43c1a1fe..aff00c3e84b69 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -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 */ diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 9737b11a0133b..b4d77a0fe54ae 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -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(); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5733982315d7e..4dba2f0b09073 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -411,17 +411,6 @@ public abstract class PackageManager { */ public static final int MATCH_DIRECT_BOOT_AWARE = 0x00080000; - /** @removed */ - @Deprecated - public static final int MATCH_ENCRYPTION_UNAWARE = 0x00040000; - /** @removed */ - @Deprecated - public static final int MATCH_ENCRYPTION_AWARE = 0x00080000; - /** @removed */ - @Deprecated - public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = MATCH_ENCRYPTION_AWARE - | MATCH_ENCRYPTION_UNAWARE; - /** * Querying flag: include only components from applications that are marked * with {@link ApplicationInfo#FLAG_SYSTEM}. diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java index a2f4db6e75223..756c3f4821209 100644 --- a/core/java/android/preference/PreferenceManager.java +++ b/core/java/android/preference/PreferenceManager.java @@ -420,12 +420,6 @@ public class PreferenceManager { mSharedPreferences = null; } - /** @removed */ - @Deprecated - public void setStorageDeviceEncrypted() { - setStorageDeviceProtected(); - } - /** * Explicitly set the storage location used internally by this class to be * credential-protected storage. This is the default storage area for apps @@ -445,12 +439,6 @@ public class PreferenceManager { mSharedPreferences = null; } - /** @removed */ - @Deprecated - public void setStorageCredentialEncrypted() { - setStorageCredentialProtected(); - } - /** * Indicates if the storage location used internally by this class is the * default provided by the hosting {@link Context}. diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index dea56aa11fdef..cdde6ea0e85a0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -87,7 +87,7 @@ public class CustomTile extends QSTile implements TileChangeListen private void setTileIcon() { try { PackageManager pm = mContext.getPackageManager(); - int flags = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE; + int flags = PackageManager.MATCH_DIRECT_BOOT_UNAWARE | PackageManager.MATCH_DIRECT_BOOT_AWARE; if (isSystemApp(pm)) { flags |= PackageManager.MATCH_DISABLED_COMPONENTS; } diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java index 28596f7b0ac27..d8db3315d423b 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java @@ -413,9 +413,7 @@ public class PackageParserTest { assertTrue(Arrays.equals(a.sharedLibraryFiles, that.sharedLibraryFiles)); assertEquals(a.dataDir, that.dataDir); assertEquals(a.deviceProtectedDataDir, that.deviceProtectedDataDir); - assertEquals(a.deviceEncryptedDataDir, that.deviceEncryptedDataDir); assertEquals(a.credentialProtectedDataDir, that.credentialProtectedDataDir); - assertEquals(a.credentialEncryptedDataDir, that.credentialEncryptedDataDir); assertEquals(a.nativeLibraryDir, that.nativeLibraryDir); assertEquals(a.secondaryNativeLibraryDir, that.secondaryNativeLibraryDir); assertEquals(a.nativeLibraryRootDir, that.nativeLibraryRootDir);