am 7ddf38a5: am be70785f: Make activity manager more robust in the face of app activity leaks. (1093c9ac) · Commits · e / os / android_frameworks_base

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

+19 −18

Original line number	Original line	Diff line number	Diff line
	@@ -1669,7 +1669,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	final void setFocusedActivityLocked(ActivityRecord r) {		final void setFocusedActivityLocked(ActivityRecord r) {
	if (mFocusedActivity != r) {		if (mFocusedActivity != r) {
	mFocusedActivity = r;		mFocusedActivity = r;
	mWindowManager.setFocusedApp(r, true);		mWindowManager.setFocusedApp(r.appToken, true);
	}		}
	}		}

	@@ -2346,7 +2346,8 @@ public final class ActivityManagerService extends ActivityManagerNative
	// XXX we are not dealing with propagating grantedUriPermissions...		// XXX we are not dealing with propagating grantedUriPermissions...
	// those are not yet exposed to user code, so there is no need.		// those are not yet exposed to user code, so there is no need.
	int res = mMainStack.startActivityLocked(r.app.thread, intent,		int res = mMainStack.startActivityLocked(r.app.thread, intent,
	r.resolvedType, null, 0, aInfo, resultTo, resultWho,		r.resolvedType, null, 0, aInfo,
			resultTo != null ? resultTo.appToken : null, resultWho,
	requestCode, -1, r.launchedFromUid, false, false, null);		requestCode, -1, r.launchedFromUid, false, false, null);
	Binder.restoreCallingIdentity(origId);		Binder.restoreCallingIdentity(origId);

	@@ -2429,10 +2430,10 @@ public final class ActivityManagerService extends ActivityManagerNative
	return;		return;
	}		}
	final long origId = Binder.clearCallingIdentity();		final long origId = Binder.clearCallingIdentity();
	mWindowManager.setAppOrientation(r, requestedOrientation);		mWindowManager.setAppOrientation(r.appToken, requestedOrientation);
	Configuration config = mWindowManager.updateOrientationFromAppTokens(		Configuration config = mWindowManager.updateOrientationFromAppTokens(
	mConfiguration,		mConfiguration,
	r.mayFreezeScreenLocked(r.app) ? r : null);		r.mayFreezeScreenLocked(r.app) ? r.appToken : null);
	if (config != null) {		if (config != null) {
	r.frozenBeforeDestroy = true;		r.frozenBeforeDestroy = true;
	if (!updateConfigurationLocked(config, r, false)) {		if (!updateConfigurationLocked(config, r, false)) {
	@@ -2449,7 +2450,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	if (r == null) {		if (r == null) {
	return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;		return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
	}		}
	return mWindowManager.getAppOrientation(r);		return mWindowManager.getAppOrientation(r.appToken);
	}		}
	}		}

	@@ -2515,7 +2516,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	for (int i=0; i<activities.size(); i++) {		for (int i=0; i<activities.size(); i++) {
	ActivityRecord r = activities.get(i);		ActivityRecord r = activities.get(i);
	if (!r.finishing) {		if (!r.finishing) {
	int index = mMainStack.indexOfTokenLocked(r);		int index = mMainStack.indexOfTokenLocked(r.appToken);
	if (index >= 0) {		if (index >= 0) {
	mMainStack.finishActivityLocked(r, index, Activity.RESULT_CANCELED,		mMainStack.finishActivityLocked(r, index, Activity.RESULT_CANCELED,
	null, "finish-heavy");		null, "finish-heavy");
	@@ -2617,7 +2618,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	int i;		int i;
	for (i=mMainStack.mHistory.size()-1; i>=0; i--) {		for (i=mMainStack.mHistory.size()-1; i>=0; i--) {
	ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);		ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);
	if (r == token) {		if (r.appToken == token) {
	return true;		return true;
	}		}
	if (r.fullscreen && !r.finishing) {		if (r.fullscreen && !r.finishing) {
	@@ -2705,9 +2706,9 @@ public final class ActivityManagerService extends ActivityManagerNative
	r.makeFinishing();		r.makeFinishing();
	mMainStack.mHistory.remove(i);		mMainStack.mHistory.remove(i);
	r.takeFromHistory();		r.takeFromHistory();
	mWindowManager.removeAppToken(r);		mWindowManager.removeAppToken(r.appToken);
	if (VALIDATE_TOKENS) {		if (VALIDATE_TOKENS) {
	mWindowManager.validateAppTokens(mMainStack.mHistory);		mMainStack.validateAppTokensLocked();
	}		}
	r.removeUriPermissionsLocked();		r.removeUriPermissionsLocked();

	@@ -5173,10 +5174,10 @@ public final class ActivityManagerService extends ActivityManagerNative
	if (topThumbnail != null) {		if (topThumbnail != null) {
	if (localLOGV) Slog.v(TAG, "Requesting top thumbnail");		if (localLOGV) Slog.v(TAG, "Requesting top thumbnail");
	try {		try {
	topThumbnail.requestThumbnail(topRecord);		topThumbnail.requestThumbnail(topRecord.appToken);
	} catch (Exception e) {		} catch (Exception e) {
	Slog.w(TAG, "Exception thrown when requesting thumbnail", e);		Slog.w(TAG, "Exception thrown when requesting thumbnail", e);
	sendPendingThumbnail(null, topRecord, null, null, true);		sendPendingThumbnail(null, topRecord.appToken, null, null, true);
	}		}
	}		}

	@@ -5547,7 +5548,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	TaskRecord lastTask = null;		TaskRecord lastTask = null;
	for (int i=0; i<N; i++) {		for (int i=0; i<N; i++) {
	ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);		ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);
	if (r == token) {		if (r.appToken == token) {
	if (!onlyRoot \|\| lastTask != r.task) {		if (!onlyRoot \|\| lastTask != r.task) {
	return r.task.taskId;		return r.task.taskId;
	}		}
	@@ -5568,7 +5569,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	for (int i=0; i<N; i++) {		for (int i=0; i<N; i++) {
	ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);		ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);
	if (r.realActivity.equals(className)		if (r.realActivity.equals(className)
	&& r != token && lastTask != r.task) {		&& r.appToken != token && lastTask != r.task) {
	if (r.stack.finishActivityLocked(r, i, Activity.RESULT_CANCELED,		if (r.stack.finishActivityLocked(r, i, Activity.RESULT_CANCELED,
	null, "others")) {		null, "others")) {
	i--;		i--;
	@@ -7112,7 +7113,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	// process, then terminate it to avoid getting in a loop.		// process, then terminate it to avoid getting in a loop.
	Slog.w(TAG, " Force finishing activity "		Slog.w(TAG, " Force finishing activity "
	+ r.intent.getComponent().flattenToShortString());		+ r.intent.getComponent().flattenToShortString());
	int index = mMainStack.indexOfTokenLocked(r);		int index = mMainStack.indexOfActivityLocked(r);
	r.stack.finishActivityLocked(r, index,		r.stack.finishActivityLocked(r, index,
	Activity.RESULT_CANCELED, null, "crashed");		Activity.RESULT_CANCELED, null, "crashed");
	// Also terminate any activities below it that aren't yet		// Also terminate any activities below it that aren't yet
	@@ -8631,8 +8632,8 @@ public final class ActivityManagerService extends ActivityManagerNative
	try {		try {
	TransferPipe tp = new TransferPipe();		TransferPipe tp = new TransferPipe();
	try {		try {
	r.app.thread.dumpActivity(tp.getWriteFd().getFileDescriptor(), r,		r.app.thread.dumpActivity(tp.getWriteFd().getFileDescriptor(),
	innerPrefix, args);		r.appToken, innerPrefix, args);
	tp.go(fd);		tp.go(fd);
	} finally {		} finally {
	tp.kill();		tp.kill();
	@@ -9048,8 +9049,8 @@ public final class ActivityManagerService extends ActivityManagerNative
	try {		try {
	TransferPipe tp = new TransferPipe();		TransferPipe tp = new TransferPipe();
	try {		try {
	r.app.thread.dumpActivity(tp.getWriteFd().getFileDescriptor(), r,		r.app.thread.dumpActivity(tp.getWriteFd().getFileDescriptor(),
	innerPrefix, args);		r.appToken, innerPrefix, args);
	// Short timeout, since blocking here can		// Short timeout, since blocking here can
	// deadlock with the application.		// deadlock with the application.
	tp.go(fd, 2000);		tp.go(fd, 2000);

services/java/com/android/server/am/ActivityRecord.java

+74 −7

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ import android.content.res.Configuration;
	import android.graphics.Bitmap;		import android.graphics.Bitmap;
	import android.os.Build;		import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
			import android.os.IBinder;
	import android.os.Message;		import android.os.Message;
	import android.os.Process;		import android.os.Process;
	import android.os.RemoteException;		import android.os.RemoteException;
	@@ -48,9 +49,10 @@ import java.util.HashSet;
	/**		/**
	* An entry in the history stack, representing an activity.		* An entry in the history stack, representing an activity.
	*/		*/
	final class ActivityRecord extends IApplicationToken.Stub {		final class ActivityRecord {
	final ActivityManagerService service; // owner		final ActivityManagerService service; // owner
	final ActivityStack stack; // owner		final ActivityStack stack; // owner
			final IApplicationToken.Stub appToken; // window manager token
	final ActivityInfo info; // all about me		final ActivityInfo info; // all about me
	final int launchedFromUid; // always the uid who started the activity.		final int launchedFromUid; // always the uid who started the activity.
	final Intent intent; // the original intent that generated us		final Intent intent; // the original intent that generated us
	@@ -200,6 +202,70 @@ final class ActivityRecord extends IApplicationToken.Stub {
	}		}
	}		}

			static class Token extends IApplicationToken.Stub {
			final WeakReference<ActivityRecord> weakActivity;

			Token(ActivityRecord activity) {
			weakActivity = new WeakReference<ActivityRecord>(activity);
			}

			@Override public void windowsDrawn() throws RemoteException {
			ActivityRecord activity = weakActivity.get();
			if (activity != null) {
			activity.windowsDrawn();
			}
			}

			@Override public void windowsVisible() throws RemoteException {
			ActivityRecord activity = weakActivity.get();
			if (activity != null) {
			activity.windowsVisible();
			}
			}

			@Override public void windowsGone() throws RemoteException {
			ActivityRecord activity = weakActivity.get();
			if (activity != null) {
			activity.windowsGone();
			}
			}

			@Override public boolean keyDispatchingTimedOut() throws RemoteException {
			ActivityRecord activity = weakActivity.get();
			if (activity != null) {
			return activity.keyDispatchingTimedOut();
			}
			return false;
			}

			@Override public long getKeyDispatchingTimeout() throws RemoteException {
			ActivityRecord activity = weakActivity.get();
			if (activity != null) {
			return activity.getKeyDispatchingTimeout();
			}
			return 0;
			}

			public String toString() {
			StringBuilder sb = new StringBuilder(128);
			sb.append("Token{");
			sb.append(Integer.toHexString(System.identityHashCode(this)));
			sb.append(' ');
			sb.append(weakActivity.get());
			sb.append('}');
			return sb.toString();
			}
			}

			static ActivityRecord forToken(IBinder token) {
			try {
			return token != null ? ((Token)token).weakActivity.get() : null;
			} catch (ClassCastException e) {
			Slog.w(ActivityManagerService.TAG, "Bad activity token: " + token, e);
			return null;
			}
			}

	ActivityRecord(ActivityManagerService _service, ActivityStack _stack, ProcessRecord _caller,		ActivityRecord(ActivityManagerService _service, ActivityStack _stack, ProcessRecord _caller,
	int _launchedFromUid, Intent _intent, String _resolvedType,		int _launchedFromUid, Intent _intent, String _resolvedType,
	ActivityInfo aInfo, Configuration _configuration,		ActivityInfo aInfo, Configuration _configuration,
	@@ -207,6 +273,7 @@ final class ActivityRecord extends IApplicationToken.Stub {
	boolean _componentSpecified) {		boolean _componentSpecified) {
	service = _service;		service = _service;
	stack = _stack;		stack = _stack;
			appToken = new Token(this);
	info = aInfo;		info = aInfo;
	launchedFromUid = _launchedFromUid;		launchedFromUid = _launchedFromUid;
	intent = _intent;		intent = _intent;
	@@ -445,7 +512,7 @@ final class ActivityRecord extends IApplicationToken.Stub {
	ar.add(intent);		ar.add(intent);
	service.grantUriPermissionFromIntentLocked(callingUid, packageName,		service.grantUriPermissionFromIntentLocked(callingUid, packageName,
	intent, getUriPermissionsLocked());		intent, getUriPermissionsLocked());
	app.thread.scheduleNewIntent(ar, this);		app.thread.scheduleNewIntent(ar, appToken);
	sent = true;		sent = true;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(ActivityManagerService.TAG,		Slog.w(ActivityManagerService.TAG,
	@@ -470,14 +537,14 @@ final class ActivityRecord extends IApplicationToken.Stub {
	void pauseKeyDispatchingLocked() {		void pauseKeyDispatchingLocked() {
	if (!keysPaused) {		if (!keysPaused) {
	keysPaused = true;		keysPaused = true;
	service.mWindowManager.pauseKeyDispatching(this);		service.mWindowManager.pauseKeyDispatching(appToken);
	}		}
	}		}

	void resumeKeyDispatchingLocked() {		void resumeKeyDispatchingLocked() {
	if (keysPaused) {		if (keysPaused) {
	keysPaused = false;		keysPaused = false;
	service.mWindowManager.resumeKeyDispatching(this);		service.mWindowManager.resumeKeyDispatching(appToken);
	}		}
	}		}

	@@ -512,14 +579,14 @@ final class ActivityRecord extends IApplicationToken.Stub {

	public void startFreezingScreenLocked(ProcessRecord app, int configChanges) {		public void startFreezingScreenLocked(ProcessRecord app, int configChanges) {
	if (mayFreezeScreenLocked(app)) {		if (mayFreezeScreenLocked(app)) {
	service.mWindowManager.startAppFreezingScreen(this, configChanges);		service.mWindowManager.startAppFreezingScreen(appToken, configChanges);
	}		}
	}		}

	public void stopFreezingScreenLocked(boolean force) {		public void stopFreezingScreenLocked(boolean force) {
	if (force \|\| frozenBeforeDestroy) {		if (force \|\| frozenBeforeDestroy) {
	frozenBeforeDestroy = false;		frozenBeforeDestroy = false;
	service.mWindowManager.stopAppFreezingScreen(this, force);		service.mWindowManager.stopAppFreezingScreen(appToken, force);
	}		}
	}		}

	@@ -687,7 +754,7 @@ final class ActivityRecord extends IApplicationToken.Stub {
	}		}
	if (app != null && app.thread != null) {		if (app != null && app.thread != null) {
	try {		try {
	app.thread.scheduleSleeping(this, _sleeping);		app.thread.scheduleSleeping(appToken, _sleeping);
	if (sleeping && !stack.mGoingToSleepActivities.contains(this)) {		if (sleeping && !stack.mGoingToSleepActivities.contains(this)) {
	stack.mGoingToSleepActivities.add(this);		stack.mGoingToSleepActivities.add(this);
	}		}

services/java/com/android/server/am/ActivityStack.java

+104 −93

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/wm/WindowManagerService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3070,7 +3070,7 @@ public class WindowManagerService extends IWindowManager.Stub
	// Application Window Tokens		// Application Window Tokens
	// -------------------------------------------------------------		// -------------------------------------------------------------

	public void validateAppTokens(List tokens) {		public void validateAppTokens(List<IBinder> tokens) {
	int v = tokens.size()-1;		int v = tokens.size()-1;
	int m = mAppTokens.size()-1;		int m = mAppTokens.size()-1;
	while (v >= 0 && m >= 0) {		while (v >= 0 && m >= 0) {