Merge "Revert "Add lockTaskOnLaunch attribute."" (aa2609aa) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ActivityInfo.java

+3 −13

Original line number	Original line	Diff line number	Diff line
	@@ -648,12 +648,6 @@ public class ActivityInfo extends ComponentInfo
	*/		*/
	public boolean resizeable;		public boolean resizeable;

	/**
	* Value indicating if the activity is to be locked at startup.
	* @hide
	*/
	public boolean lockTaskOnLaunch;

	public ActivityInfo() {		public ActivityInfo() {
	}		}

	@@ -671,8 +665,6 @@ public class ActivityInfo extends ComponentInfo
	uiOptions = orig.uiOptions;		uiOptions = orig.uiOptions;
	parentActivityName = orig.parentActivityName;		parentActivityName = orig.parentActivityName;
	maxRecents = orig.maxRecents;		maxRecents = orig.maxRecents;
	resizeable = orig.resizeable;
	lockTaskOnLaunch = orig.lockTaskOnLaunch;
	}		}

	/**		/**
	@@ -717,7 +709,7 @@ public class ActivityInfo extends ComponentInfo
	if (uiOptions != 0) {		if (uiOptions != 0) {
	pw.println(prefix + " uiOptions=0x" + Integer.toHexString(uiOptions));		pw.println(prefix + " uiOptions=0x" + Integer.toHexString(uiOptions));
	}		}
	pw.println(prefix + "resizeable=" + resizeable + " lockTaskOnLaunch=" + lockTaskOnLaunch);		pw.println(prefix + "resizeable=" + resizeable);
	super.dumpBack(pw, prefix);		super.dumpBack(pw, prefix);
	}		}

	@@ -747,7 +739,6 @@ public class ActivityInfo extends ComponentInfo
	dest.writeInt(persistableMode);		dest.writeInt(persistableMode);
	dest.writeInt(maxRecents);		dest.writeInt(maxRecents);
	dest.writeInt(resizeable ? 1 : 0);		dest.writeInt(resizeable ? 1 : 0);
	dest.writeInt(lockTaskOnLaunch ? 1 : 0);
	}		}

	public static final Parcelable.Creator<ActivityInfo> CREATOR		public static final Parcelable.Creator<ActivityInfo> CREATOR
	@@ -776,6 +767,5 @@ public class ActivityInfo extends ComponentInfo
	persistableMode = source.readInt();		persistableMode = source.readInt();
	maxRecents = source.readInt();		maxRecents = source.readInt();
	resizeable = (source.readInt() == 1);		resizeable = (source.readInt() == 1);
	lockTaskOnLaunch = (source.readInt() == 1);
	}		}
	}		}

core/java/android/content/pm/PackageParser.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3113,9 +3113,6 @@ public class PackageParser {
	R.styleable.AndroidManifestActivity_screenOrientation,		R.styleable.AndroidManifestActivity_screenOrientation,
	ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);		ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
	}		}

	a.info.lockTaskOnLaunch =
	sa.getBoolean(R.styleable.AndroidManifestActivity_lockTaskOnLaunch, false);
	} else {		} else {
	a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE;		a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE;
	a.info.configChanges = 0;		a.info.configChanges = 0;

core/res/res/values/attrs_manifest.xml

+5 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1038,13 +1038,6 @@
	activity. -->		activity. -->
	<attr name="resizeableActivity" format="boolean" />		<attr name="resizeableActivity" format="boolean" />

	<!-- Tasks rooted at this activity will start up in lock-task mode. That means that they
	cannot be navigated away from until they finish or explicitly release lock-task mode.
	This only works for system privileged activities. An exception will be thrown for
	non-privileged activities that use this attribute.
	@hide -->
	<attr name="lockTaskOnLaunch" format="boolean" />

	<!-- When set installer will extract native libraries. If set to false		<!-- When set installer will extract native libraries. If set to false
	libraries in the apk must be stored and page-aligned. -->		libraries in the apk must be stored and page-aligned. -->
	<attr name="extractNativeLibs" format="boolean"/>		<attr name="extractNativeLibs" format="boolean"/>
	@@ -1756,7 +1749,6 @@
	<attr name="relinquishTaskIdentity" />		<attr name="relinquishTaskIdentity" />
	<attr name="resumeWhilePausing" />		<attr name="resumeWhilePausing" />
	<attr name="resizeableActivity" />		<attr name="resizeableActivity" />
	<attr name="lockTaskOnLaunch" />
	</declare-styleable>		</declare-styleable>

	<!-- The <code>activity-alias</code> tag declares a new		<!-- The <code>activity-alias</code> tag declares a new

core/res/res/values/public.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2657,5 +2657,4 @@
	<!--IntentFilter auto verification -->		<!--IntentFilter auto verification -->
	<public type="attr" name="autoVerify" />		<public type="attr" name="autoVerify" />

	<public type="attr" name="lockTaskOnLaunch" />
	</resources>		</resources>

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3911,9 +3911,9 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	// Do not allow task to finish in Lock Task mode.		// Do not allow task to finish in Lock Task mode.
	if (tr == mStackSupervisor.mLockTaskModeTask) {		if (tr == mStackSupervisor.mLockTaskModeTask) {
	if (rootR == r && tr.getTopActivity() == r) {		if (rootR == r) {
	Slog.i(TAG, "Not finishing task in lock task mode");		Slog.i(TAG, "Not finishing task in lock task mode");
	mStackSupervisor.showLockTaskToastLocked();		mStackSupervisor.showLockTaskToast();
	return false;		return false;
	}		}
	}		}
	@@ -4074,7 +4074,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	// Do not allow task to finish in Lock Task mode.		// Do not allow task to finish in Lock Task mode.
	if (r.task == mStackSupervisor.mLockTaskModeTask) {		if (r.task == mStackSupervisor.mLockTaskModeTask) {
	if (rootR == r) {		if (rootR == r) {
	mStackSupervisor.showLockTaskToastLocked();		mStackSupervisor.showLockTaskToast();
	return false;		return false;
	}		}
	}		}
	@@ -8238,7 +8238,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	return;		return;
	}		}
	if (mStackSupervisor.isLockTaskModeViolation(task)) {		if (mStackSupervisor.isLockTaskModeViolation(task)) {
	mStackSupervisor.showLockTaskToastLocked();		mStackSupervisor.showLockTaskToast();
	Slog.e(TAG, "moveTaskToFront: Attempt to violate Lock Task Mode");		Slog.e(TAG, "moveTaskToFront: Attempt to violate Lock Task Mode");
	return;		return;
	}		}
	@@ -8272,7 +8272,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	if (taskId >= 0) {		if (taskId >= 0) {
	if ((mStackSupervisor.mLockTaskModeTask != null)		if ((mStackSupervisor.mLockTaskModeTask != null)
	&& (mStackSupervisor.mLockTaskModeTask.taskId == taskId)) {		&& (mStackSupervisor.mLockTaskModeTask.taskId == taskId)) {
	mStackSupervisor.showLockTaskToastLocked();		mStackSupervisor.showLockTaskToast();
	return false;		return false;
	}		}
	return ActivityRecord.getStackLocked(token).moveTaskToBackLocked(taskId);		return ActivityRecord.getStackLocked(token).moveTaskToBackLocked(taskId);