Pass displayId to onActivityRotation() (bedb9f33) · Commits · e / os / android_frameworks_base

core/java/android/app/ITaskStackListener.aidl

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -224,6 +224,8 @@ oneway interface ITaskStackListener {
	* * forced rotation		* * forced rotation
	* * rotation settings set through adb command line		* * rotation settings set through adb command line
	* * rotation that occurs when rotation tile is toggled in quick settings		* * rotation that occurs when rotation tile is toggled in quick settings
			*
			* @param displayId id of the display where activity will rotate
	*/		*/
	void onActivityRotation();		void onActivityRotation(int displayId);
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -201,6 +201,6 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {
	}		}

	@Override		@Override
	public void onActivityRotation() {		public void onActivityRotation(int displayId) {
	}		}
	}		}

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -115,6 +115,6 @@ public abstract class TaskStackChangeListener {
	/** @see ITaskStackListener#onRecentTaskListFrozenChanged(boolean) */		/** @see ITaskStackListener#onRecentTaskListFrozenChanged(boolean) */
	public void onRecentTaskListFrozenChanged(boolean frozen) { }		public void onRecentTaskListFrozenChanged(boolean frozen) { }

	/** @see ITaskStackListener#onActivityRotation()*/		/** @see ITaskStackListener#onActivityRotation(int)*/
	public void onActivityRotation() { }		public void onActivityRotation(int displayId) { }
	}		}

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -238,8 +238,9 @@ public class TaskStackChangeListeners extends TaskStackListener {
	}		}

	@Override		@Override
	public void onActivityRotation() {		public void onActivityRotation(int displayId) {
	mHandler.obtainMessage(H.ON_ACTIVITY_ROTATION).sendToTarget();		mHandler.obtainMessage(H.ON_ACTIVITY_ROTATION, displayId, 0 /* unused */)
			.sendToTarget();
	}		}

	private final class H extends Handler {		private final class H extends Handler {
	@@ -435,7 +436,7 @@ public class TaskStackChangeListeners extends TaskStackListener {
	}		}
	case ON_ACTIVITY_ROTATION: {		case ON_ACTIVITY_ROTATION: {
	for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {		for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {
	mTaskStackListeners.get(i).onActivityRotation();		mTaskStackListeners.get(i).onActivityRotation(msg.arg1);
	}		}
	break;		break;
	}		}

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -185,7 +185,7 @@ class TaskChangeNotificationController {
	};		};

	private final TaskStackConsumer mNotifyOnActivityRotation = (l, m) -> {		private final TaskStackConsumer mNotifyOnActivityRotation = (l, m) -> {
	l.onActivityRotation();		l.onActivityRotation(m.arg1);
	};		};

	@FunctionalInterface		@FunctionalInterface
	@@ -583,9 +583,10 @@ class TaskChangeNotificationController {
	msg.sendToTarget();		msg.sendToTarget();
	}		}

	/** @see android.app.ITaskStackListener#onActivityRotation() */		/** @see android.app.ITaskStackListener#onActivityRotation(int) */
	void notifyOnActivityRotation() {		void notifyOnActivityRotation(int displayId) {
	final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_ROTATED_MSG);		final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_ROTATED_MSG,
			displayId, 0 /* unused */);
	forAllLocalListeners(mNotifyOnActivityRotation, msg);		forAllLocalListeners(mNotifyOnActivityRotation, msg);
	msg.sendToTarget();		msg.sendToTarget();
	}		}