From 7987a3172b0502ea70a26d80e7cd16ca7e460035 Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Wed, 17 Apr 2013 18:59:33 +0900
Subject: Fix possible NPE

Bug: 8517083
Change-Id: Iea6bdcb0e39ee951b7f90f41cd3350bd1c7c5f71
---
 services/java/com/android/server/InputMethodManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'services/java/com/android/server/InputMethodManagerService.java')

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index a28c387..f872cc3 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1595,7 +1595,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                     ApplicationInfo ai = mIPackageManager.getApplicationInfo(imm.getPackageName(),
                             PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
                             mSettings.getCurrentUserId());
-                    if (ai.enabledSetting
+                    if (ai != null && ai.enabledSetting
                             == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
                         mIPackageManager.setApplicationEnabledSetting(imm.getPackageName(),
                                 PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
-- 
cgit v1.1