Merge "Add type annotation to ActivityOptions." into main (bbe32bb6) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1846,6 +1846,7 @@ public class ActivityOptions extends ComponentOptions {
	}		}

	/** @hide */		/** @hide */
			@WindowConfiguration.WindowingMode
	public int getLaunchWindowingMode() {		public int getLaunchWindowingMode() {
	return mLaunchWindowingMode;		return mLaunchWindowingMode;
	}		}
	@@ -1855,7 +1856,7 @@ public class ActivityOptions extends ComponentOptions {
	* @hide		* @hide
	*/		*/
	@TestApi		@TestApi
	public void setLaunchWindowingMode(int windowingMode) {		public void setLaunchWindowingMode(@WindowConfiguration.WindowingMode int windowingMode) {
	mLaunchWindowingMode = windowingMode;		mLaunchWindowingMode = windowingMode;
	}		}