Merge "Add Nullable annotation to getDecorView" am: a018254b45

am: b812cec859

Change-Id: I13b43231caaca17dfa3f67c9d77c0792a77f6e3b

core/java/android/preference/DialogPreference.java

@@ -19,6 +19,7 @@ package android.preference;
 
 import android.annotation.CallSuper;
 import android.annotation.DrawableRes;
+import android.annotation.Nullable;
 import android.annotation.StringRes;
 import android.annotation.UnsupportedAppUsage;
 import android.app.AlertDialog;
@@ -347,6 +348,7 @@ public abstract class DialogPreference extends Preference implements
      * @return the DecorView for the current dialog window, if it exists.
      * If the window does not exist, null is returned.
      */
+    @Nullable
     private View getDecorView() {
         if (mDialog != null && mDialog.getWindow() != null) {
             return mDialog.getWindow().getDecorView();