Merge "Avoid unnecessary binder call to set the same orientation" into main (fd3284b3) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1002,6 +1002,9 @@ public class Activity extends ContextThemeWrapper
	new ActivityManager.TaskDescription();		new ActivityManager.TaskDescription();
	private int mLastTaskDescriptionHashCode;		private int mLastTaskDescriptionHashCode;

			@ActivityInfo.ScreenOrientation
			private int mLastRequestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSET;

	protected static final int[] FOCUSED_STATE_SET = {com.android.internal.R.attr.state_focused};		protected static final int[] FOCUSED_STATE_SET = {com.android.internal.R.attr.state_focused};

	@SuppressWarnings("unused")		@SuppressWarnings("unused")
	@@ -7530,11 +7533,15 @@ public class Activity extends ContextThemeWrapper
	* {@link ActivityInfo#screenOrientation ActivityInfo.screenOrientation}.		* {@link ActivityInfo#screenOrientation ActivityInfo.screenOrientation}.
	*/		*/
	public void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) {		public void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) {
			if (requestedOrientation == mLastRequestedOrientation) {
			return;
			}
	if (mParent == null) {		if (mParent == null) {
	ActivityClient.getInstance().setRequestedOrientation(mToken, requestedOrientation);		ActivityClient.getInstance().setRequestedOrientation(mToken, requestedOrientation);
	} else {		} else {
	mParent.setRequestedOrientation(requestedOrientation);		mParent.setRequestedOrientation(requestedOrientation);
	}		}
			mLastRequestedOrientation = requestedOrientation;
	}		}

	/**		/**
	@@ -7548,6 +7555,9 @@ public class Activity extends ContextThemeWrapper
	*/		*/
	@ActivityInfo.ScreenOrientation		@ActivityInfo.ScreenOrientation
	public int getRequestedOrientation() {		public int getRequestedOrientation() {
			if (mLastRequestedOrientation != ActivityInfo.SCREEN_ORIENTATION_UNSET) {
			return mLastRequestedOrientation;
			}
	if (mParent == null) {		if (mParent == null) {
	return ActivityClient.getInstance().getRequestedOrientation(mToken);		return ActivityClient.getInstance().getRequestedOrientation(mToken);
	} else {		} else {