Merge "Only initialize Session's package name once." into sc-dev (fca79abe) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/Session.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -640,9 +640,16 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
		}
		}

		void windowAddedLocked(String packageName) {
		mPackageName = packageName;
		void windowAddedLocked() {
		if (mPackageName == null) {
		final WindowProcessController wpc = mService.mAtmService.mProcessMap.getProcess(mPid);
		if (wpc != null) {
		mPackageName = wpc.mInfo.packageName;
		mRelayoutTag = "relayoutWindow: " + mPackageName;
		} else {
		Slog.e(TAG_WM, "Unknown process pid=" + mPid);
		}
		}
		if (mSurfaceSession == null) {
		if (DEBUG) {
		Slog.v(TAG_WM, "First window added to " + this + ", creating SurfaceSession");

+1 −1

Original line number	Diff line number	Diff line
		@@ -1140,7 +1140,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP

		void attach() {
		if (DEBUG) Slog.v(TAG, "Attaching " + this + " token=" + mToken);
		mSession.windowAddedLocked(mAttrs.packageName);
		mSession.windowAddedLocked();
		}

		/**