commit a018254b452a04e0f4822b38c15b47df9c0a230d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 13 16:09:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 13 16:09:00 2019 +0000
tree 82deb23b9c070c1f1857ccc147a7b839b21d9967
parent b2c1daf861cda8a917a22a7297eff7569aec0ea5
parent 984d64d8714e8f7bc29fb62e18b7fa75171792cf

Merge "Add Nullable annotation to getDecorView"

core/java/android/preference/DialogPreference.java

diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java
index a615f2d..0fb7e38 100644
--- a/core/java/android/preference/DialogPreference.java
+++ b/core/java/android/preference/DialogPreference.java
@@ -19,6 +19,7 @@
 
 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 @@
      * @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();