diff options
| author | Charles Chen <charlesccchen@google.com> | 2021-05-11 04:08:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-11 04:08:49 +0000 |
| commit | c8bf38ce250b16e8794f61fe0c5465fd10da0562 (patch) | |
| tree | 933c6c523401bcdaa5e6691b83e5f8886a585374 /core/java | |
| parent | 66fcb0d72d18e72436c1b349af0044d66954e745 (diff) | |
| parent | 71cb758286938a27d85be09145859a909144eb23 (diff) | |
Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Presentation.java | 5 | ||||
| -rw-r--r-- | core/java/com/android/internal/util/Preconditions.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/Presentation.java b/core/java/android/app/Presentation.java index ad903642c908..e90bf86f175d 100644 --- a/core/java/android/app/Presentation.java +++ b/core/java/android/app/Presentation.java @@ -37,7 +37,8 @@ import android.view.Window; import android.view.WindowManager; import android.view.WindowManager.LayoutParams.WindowType; -import com.android.internal.util.Preconditions; +import java.util.Objects; + /** * Base class for presentations. * <p> @@ -153,7 +154,7 @@ public class Presentation extends Dialog { private final Display mDisplay; private final DisplayManager mDisplayManager; - private final Handler mHandler = new Handler(Preconditions.checkNotNull(Looper.myLooper(), + private final Handler mHandler = new Handler(Objects.requireNonNull(Looper.myLooper(), "Presentation must be constructed on a looper thread.")); /** diff --git a/core/java/com/android/internal/util/Preconditions.java b/core/java/com/android/internal/util/Preconditions.java index 88e4e355000a..d2d822083a95 100644 --- a/core/java/com/android/internal/util/Preconditions.java +++ b/core/java/com/android/internal/util/Preconditions.java @@ -158,7 +158,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @return the non-null reference that was validated * @throws NullPointerException if {@code reference} is null - * @deprecated - use {@link java.util.Objects.requireNonNull} instead. + * @deprecated - use {@link java.util.Objects#requireNonNull} instead. */ @Deprecated @UnsupportedAppUsage |