commit b9d84550d5232ee4788f29c5834b4728c5ba5dd0
author Menghan Li <menghanli@google.com> Thu Feb 13 14:49:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 13 14:49:53 2020 +0000
tree d8d145a436c63161df2b3ac83f6cee6cd227e15c
parent aead434f80d67fa905d00be7be16b2083d022c08
parent 1cb9b231777c226776ecb31f70002f62c31a31e6

Merge "Remove the toast null pointer checker"

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
index fb6f266..a1c22e9 100644
--- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
+++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
@@ -262,10 +262,8 @@
         String toastMessage = String.format(toastMessageFormatString, serviceName);
         Toast warningToast = mFrameworkObjectProvider.makeToastFromText(
                 mContext, toastMessage, Toast.LENGTH_LONG);
-        if (warningToast.getWindowParams() != null) {
-            warningToast.getWindowParams().privateFlags |=
-                    WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
-        }
+        warningToast.getWindowParams().privateFlags |=
+                WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
         warningToast.show();
     }