Merge "Return null for getWindowParams() on system-rendered toasts" (663a13b1) · Commits · e / os / android_frameworks_base

core/java/android/widget/Toast.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -460,8 +460,19 @@ public class Toast {
		* @hide
		*/
		@UnsupportedAppUsage
		public WindowManager.LayoutParams getWindowParams() {
		@Nullable public WindowManager.LayoutParams getWindowParams() {
		if (Compatibility.isChangeEnabled(CHANGE_TEXT_TOASTS_IN_THE_SYSTEM)) {
		if (mNextView != null) {
		// Custom toasts
		return mTN.mParams;
		} else {
		// Text toasts
		return null;
		}
		} else {
		// Text and custom toasts are app-rendered
		return mTN.mParams;
		}
		}

		/**