diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 16 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 3 |
2 files changed, 3 insertions, 16 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 24c026da23e5..4723c0db621c 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -648,12 +648,6 @@ public class ActivityInfo extends ComponentInfo */ public boolean resizeable; - /** - * Value indicating if the activity is to be locked at startup. - * @hide - */ - public boolean lockTaskOnLaunch; - public ActivityInfo() { } @@ -671,15 +665,13 @@ public class ActivityInfo extends ComponentInfo uiOptions = orig.uiOptions; parentActivityName = orig.parentActivityName; maxRecents = orig.maxRecents; - resizeable = orig.resizeable; - lockTaskOnLaunch = orig.lockTaskOnLaunch; } - + /** * Return the theme resource identifier to use for this activity. If * the activity defines a theme, that is used; else, the application * theme is used. - * + * * @return The theme associated with this activity. */ public final int getThemeResource() { @@ -717,7 +709,7 @@ public class ActivityInfo extends ComponentInfo if (uiOptions != 0) { pw.println(prefix + " uiOptions=0x" + Integer.toHexString(uiOptions)); } - pw.println(prefix + "resizeable=" + resizeable + " lockTaskOnLaunch=" + lockTaskOnLaunch); + pw.println(prefix + "resizeable=" + resizeable); super.dumpBack(pw, prefix); } @@ -747,7 +739,6 @@ public class ActivityInfo extends ComponentInfo dest.writeInt(persistableMode); dest.writeInt(maxRecents); dest.writeInt(resizeable ? 1 : 0); - dest.writeInt(lockTaskOnLaunch ? 1 : 0); } public static final Parcelable.Creator<ActivityInfo> CREATOR @@ -776,6 +767,5 @@ public class ActivityInfo extends ComponentInfo persistableMode = source.readInt(); maxRecents = source.readInt(); resizeable = (source.readInt() == 1); - lockTaskOnLaunch = (source.readInt() == 1); } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 3d5c2edecf58..4b81fd41e4dc 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3113,9 +3113,6 @@ public class PackageParser { R.styleable.AndroidManifestActivity_screenOrientation, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); } - - a.info.lockTaskOnLaunch = - sa.getBoolean(R.styleable.AndroidManifestActivity_lockTaskOnLaunch, false); } else { a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE; a.info.configChanges = 0; |