commit 4d1f9e2ead8abc0a810268f1252885ec8b91fa91
author Hyejin Kim <hyejin.kim@lge.com> Tue Jan 15 11:57:01 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 15 11:57:01 2019 -0800
tree 3d57c8deb271693b507cb089002a2d2b8bb698c2
parent 689a10d0cdcc8f6ec1bedc604a15bba916a8967d
parent ee5e3f6bc9b6e937fac9b26fb3164baecac50b13

Fix NPE in hover event am: 844090e5c6
am: ee5e3f6bc9

Change-Id: I4e29d03492eca23cca4a673b75d0e58794f8f70c

src/com/android/inputmethod/latin/CarLatinIME.java

diff --git a/src/com/android/inputmethod/latin/CarLatinIME.java b/src/com/android/inputmethod/latin/CarLatinIME.java
index 0a5cd0b..a8d24c4 100644
--- a/src/com/android/inputmethod/latin/CarLatinIME.java
+++ b/src/com/android/inputmethod/latin/CarLatinIME.java
@@ -243,8 +243,11 @@
     }
 
     private void updateCapitalization() {
-        boolean shouldCapitalize =
+        boolean shouldCapitalize = false;
+        if (getCurrentInputConnection() != null) {
+            shouldCapitalize =
                 getCurrentInputConnection().getCursorCapsMode(mEditorInfo.inputType) != 0;
+        }
         mKeyboardView.setShifted(shouldCapitalize);
     }
 

src/com/android/inputmethod/latin/car/KeyboardView.java

diff --git a/src/com/android/inputmethod/latin/car/KeyboardView.java b/src/com/android/inputmethod/latin/car/KeyboardView.java
index b237bae..0888a9b 100644
--- a/src/com/android/inputmethod/latin/car/KeyboardView.java
+++ b/src/com/android/inputmethod/latin/car/KeyboardView.java
@@ -267,7 +267,7 @@
     /** The canvas for the above mutable keyboard bitmap */
     private Canvas mCanvas;
     /** The accessibility manager for accessibility support */
-    private AccessibilityManager mAccessibilityManager;
+    private final AccessibilityManager mAccessibilityManager;
 
     private boolean mUseSecondaryColor = true;
     private Locale mLocale;
@@ -382,6 +382,9 @@
         mSwipeThreshold = (int) (500 * getResources().getDisplayMetrics().density);
         mDisambiguateSwipe = true;
 
+        mAccessibilityManager =
+            (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
+
         int color = getResources().getColor(R.color.car_dark_blue_grey_700);
         mPopupScrimColor = Color.argb(
                 SCRIM_ALPHA, Color.red(color), Color.green(color), Color.blue(color));