Merge "Fix NPE when requesting outsets for detached view." into mnc-dev (844fbff8) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -7366,7 +7366,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @hide
		*/
		public void getOutsets(Rect outOutsetRect) {
		if (mAttachInfo != null) {
		outOutsetRect.set(mAttachInfo.mOutsets);
		} else {
		outOutsetRect.setEmpty();
		}
		}

		/**
		@@ -14508,7 +14512,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}

		onDetachedFromWindow();
		onDetachedFromWindows();
		onDetachedFromWindowInternal();

		InputMethodManager imm = InputMethodManager.peekInstance();