am 7f3a53a4: am 7b69e401: Merge "Fix starting window memory leak" (c7288579) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1500,6 +1500,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	return null;		return null;
	}		}

			WindowManager wm = null;
			View view = null;

	try {		try {
	Context context = mContext;		Context context = mContext;
	if (DEBUG_STARTING_WINDOW) Slog.d(TAG, "addStartingWindow " + packageName		if (DEBUG_STARTING_WINDOW) Slog.d(TAG, "addStartingWindow " + packageName
	@@ -1559,8 +1562,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	params.privateFlags \|= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;		params.privateFlags \|= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
	params.setTitle("Starting " + packageName);		params.setTitle("Starting " + packageName);

	WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);		wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
	View view = win.getDecorView();		view = win.getDecorView();

	if (win.isFloating()) {		if (win.isFloating()) {
	// Whoops, there is no way to display an animation/preview		// Whoops, there is no way to display an animation/preview
	@@ -1590,6 +1593,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	// failure loading resources because we are loading from an app		// failure loading resources because we are loading from an app
	// on external storage that has been unmounted.		// on external storage that has been unmounted.
	Log.w(TAG, appToken + " failed creating starting window", e);		Log.w(TAG, appToken + " failed creating starting window", e);
			} finally {
			if (view != null && view.getParent() == null) {
			Log.w(TAG, "view not successfully added to wm, removing view");
			wm.removeViewImmediate(view);
			}
	}		}

	return null;		return null;