Merge "Remove @Deprecated && @removed package fields."
diff --git a/api/removed.txt b/api/removed.txt
index 1a8eea75..8ccd2c6 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -126,10 +126,6 @@
field @Deprecated public String volumeUuid;
}
- public class ComponentInfo extends android.content.pm.PackageItemInfo {
- field @Deprecated public boolean encryptionAware;
- }
-
public class PackageInfo implements android.os.Parcelable {
field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
}
@@ -138,10 +134,6 @@
method public abstract boolean setInstantAppCookie(@Nullable byte[]);
}
- public class ResolveInfo implements android.os.Parcelable {
- field @Deprecated public boolean instantAppAvailable;
- }
-
public final class SharedLibraryInfo implements android.os.Parcelable {
method public boolean isBuiltin();
method public boolean isDynamic();
diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java
index 29612c2..10f0df7 100644
--- a/core/java/android/content/pm/ComponentInfo.java
+++ b/core/java/android/content/pm/ComponentInfo.java
@@ -79,10 +79,6 @@
*/
public boolean directBootAware = false;
- /** @removed */
- @Deprecated
- public boolean encryptionAware = false;
-
public ComponentInfo() {
}
@@ -94,7 +90,7 @@
descriptionRes = orig.descriptionRes;
enabled = orig.enabled;
exported = orig.exported;
- encryptionAware = directBootAware = orig.directBootAware;
+ directBootAware = orig.directBootAware;
}
/** @hide */
@@ -226,7 +222,7 @@
descriptionRes = source.readInt();
enabled = (source.readInt() != 0);
exported = (source.readInt() != 0);
- encryptionAware = directBootAware = (source.readInt() != 0);
+ directBootAware = (source.readInt() != 0);
}
/**
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 43f3fbc..a2994af 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -4288,7 +4288,7 @@
a.info.screenOrientation = SCREEN_ORIENTATION_UNSPECIFIED;
a.info.resizeMode = RESIZE_MODE_FORCE_RESIZEABLE;
a.info.lockTaskLaunchMode = 0;
- a.info.encryptionAware = a.info.directBootAware = false;
+ a.info.directBootAware = false;
a.info.rotationAnimation = ROTATION_ANIMATION_UNSPECIFIED;
a.info.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;
if (hardwareAccelerated) {
@@ -4492,7 +4492,7 @@
a.info.lockTaskLaunchMode =
sa.getInt(R.styleable.AndroidManifestActivity_lockTaskMode, 0);
- a.info.encryptionAware = a.info.directBootAware = sa.getBoolean(
+ a.info.directBootAware = sa.getBoolean(
R.styleable.AndroidManifestActivity_directBootAware,
false);
@@ -4524,7 +4524,7 @@
a.info.flags |= ActivityInfo.FLAG_SINGLE_USER;
}
- a.info.encryptionAware = a.info.directBootAware = sa.getBoolean(
+ a.info.directBootAware = sa.getBoolean(
R.styleable.AndroidManifestActivity_directBootAware,
false);
}
@@ -4920,7 +4920,7 @@
info.minAspectRatio = target.info.minAspectRatio;
info.requestedVrComponent = target.info.requestedVrComponent;
- info.encryptionAware = info.directBootAware = target.info.directBootAware;
+ info.directBootAware = target.info.directBootAware;
Activity a = new Activity(cachedArgs.mActivityAliasArgs, info);
if (outError[0] != null) {
@@ -5131,7 +5131,7 @@
p.info.flags |= ProviderInfo.FLAG_SINGLE_USER;
}
- p.info.encryptionAware = p.info.directBootAware = sa.getBoolean(
+ p.info.directBootAware = sa.getBoolean(
R.styleable.AndroidManifestProvider_directBootAware,
false);
if (p.info.directBootAware) {
@@ -5451,7 +5451,7 @@
s.info.flags |= ServiceInfo.FLAG_SINGLE_USER;
}
- s.info.encryptionAware = s.info.directBootAware = sa.getBoolean(
+ s.info.directBootAware = sa.getBoolean(
R.styleable.AndroidManifestService_directBootAware,
false);
if (s.info.directBootAware) {
diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java
index 1734182..4d3e1f7 100644
--- a/core/java/android/content/pm/ResolveInfo.java
+++ b/core/java/android/content/pm/ResolveInfo.java
@@ -75,10 +75,6 @@
*/
public boolean isInstantAppAvailable;
- /** @removed */
- @Deprecated
- public boolean instantAppAvailable;
-
/**
* The IntentFilter that was matched for this ResolveInfo.
*/
@@ -378,7 +374,6 @@
targetUserId = orig.targetUserId;
handleAllWebDataURI = orig.handleAllWebDataURI;
isInstantAppAvailable = orig.isInstantAppAvailable;
- instantAppAvailable = isInstantAppAvailable;
}
public String toString() {
@@ -490,7 +485,7 @@
noResourceId = source.readInt() != 0;
iconResourceId = source.readInt();
handleAllWebDataURI = source.readInt() != 0;
- instantAppAvailable = isInstantAppAvailable = source.readInt() != 0;
+ isInstantAppAvailable = source.readInt() != 0;
}
public static class DisplayNameComparator
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ef115f0..62dd3fb 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -11605,16 +11605,16 @@
if (pkg.applicationInfo.isDirectBootAware()) {
// we're direct boot aware; set for all components
for (PackageParser.Service s : pkg.services) {
- s.info.encryptionAware = s.info.directBootAware = true;
+ s.info.directBootAware = true;
}
for (PackageParser.Provider p : pkg.providers) {
- p.info.encryptionAware = p.info.directBootAware = true;
+ p.info.directBootAware = true;
}
for (PackageParser.Activity a : pkg.activities) {
- a.info.encryptionAware = a.info.directBootAware = true;
+ a.info.directBootAware = true;
}
for (PackageParser.Activity r : pkg.receivers) {
- r.info.encryptionAware = r.info.directBootAware = true;
+ r.info.directBootAware = true;
}
}
if (compressedFileExists(pkg.codePath)) {