Merge "Merge ActivityDisplay and DisplayContent into one class (77/n)" (97a17d56) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3417,7 +3417,7 @@ public final class ActivityThread extends ClientTransactionHandler {
		private ContextImpl createBaseContextForActivity(ActivityClientRecord r) {
		final int displayId;
		try {
		displayId = ActivityTaskManager.getService().getActivityDisplayId(r.token);
		displayId = ActivityTaskManager.getService().getDisplayId(r.token);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ interface IActivityTaskManager {
		boolean convertToTranslucent(in IBinder token, in Bundle options);
		void notifyActivityDrawn(in IBinder token);
		void reportActivityFullyDrawn(in IBinder token, boolean restoredFromBundle);
		int getActivityDisplayId(in IBinder activityToken);
		int getDisplayId(in IBinder activityToken);
		boolean isImmersive(in IBinder token);
		void setImmersive(in IBinder token, boolean immersive);
		boolean isTopActivityImmersive();

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ public class TaskEmbedder {
		return false;
		}

		// Create a container surface to which the ActivityDisplay will be reparented
		// Create a container surface to which the DisplayContent will be reparented
		final String name = "TaskEmbedder - " + Integer.toHexString(System.identityHashCode(this));
		mSurfaceControl = new SurfaceControl.Builder()
		.setContainerLayer()

+12 −12

Original line number	Diff line number	Diff line
		@@ -7,12 +7,6 @@
		"group": "WM_DEBUG_KEEP_SCREEN_ON",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-2138637148": {
		"message": "Clearing focused app, displayId=%d",
		"level": "VERBOSE",
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/ActivityDisplay.java"
		},
		"-2127842445": {
		"message": "Clearing startingData for token=%s",
		"level": "VERBOSE",
		@@ -709,6 +703,12 @@
		"group": "WM_DEBUG_BOOT",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-603199586": {
		"message": "Clearing focused app, displayId=%d",
		"level": "VERBOSE",
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/DisplayContent.java"
		},
		"-583031528": {
		"message": "%s",
		"level": "INFO",
		@@ -1315,6 +1315,12 @@
		"group": "WM_SHOW_TRANSACTIONS",
		"at": "com\/android\/server\/wm\/WindowSurfaceController.java"
		},
		"584499099": {
		"message": "Set focused app to: %s moveFocusNow=%b displayId=%d",
		"level": "VERBOSE",
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/DisplayContent.java"
		},
		"585096182": {
		"message": "SURFACE isColorSpaceAgnostic=%b: %s",
		"level": "INFO",
		@@ -1513,12 +1519,6 @@
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/WindowStateAnimator.java"
		},
		"917739349": {
		"message": "Set focused app to: %s moveFocusNow=%b displayId=%d",
		"level": "VERBOSE",
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/ActivityDisplay.java"
		},
		"954470154": {
		"message": "FORCED DISPLAY SCALING DISABLED",
		"level": "INFO",

+1 −1

Original line number	Diff line number	Diff line
		@@ -18433,7 +18433,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		public ActivityPresentationInfo getActivityPresentationInfo(IBinder token) {
		int displayId = Display.INVALID_DISPLAY;
		try {
		displayId = mActivityTaskManager.getActivityDisplayId(token);
		displayId = mActivityTaskManager.getDisplayId(token);
		} catch (RemoteException e) {
		}