Google Git
Sign in
android/platform/packages/providers/UserDictionaryProvider/refs/heads/main^1..refs/heads/main/.
commit
c2c6b446636f6229d2e1c4fb45b7bccd548178cd
[log]
author
Yeabkal Wubshit <[email protected]>
Fri Aug 16 22:46:22 2024 +0000
committer
Automerger Merge Worker <[email protected]>
Fri Aug 16 22:46:22 2024 +0000
tree
b5af0ff3852663ef1301947bc393b0143eb1cea3
parent
fe55980f47399971eaaf998d1efb97bc1b21b880 [diff]
parent
e9b16d8e7158a45313923db034ccc3af14d53311 [diff]
Merge "Fix TextServicesManagerService NPE in UserDictionaryProvider" into main am: a7143d8010 am: e9b16d8e71

Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/3222116

Change-Id: Ie1c0590e5618e6ca88e21240672c6c7546a43cda
Signed-off-by: Automerger Merge Worker <[email protected]>

diff --git a/src/com/android/providers/userdictionary/UserDictionaryProvider.java b/src/com/android/providers/userdictionary/UserDictionaryProvider.java
index 5abeefa..8b6728c 100644
--- a/src/com/android/providers/userdictionary/UserDictionaryProvider.java
+++ b/src/com/android/providers/userdictionary/UserDictionaryProvider.java

@@ -336,7 +336,8 @@
             }
         }
 
-        SpellCheckerInfo[] scInfos = mTextServiceManager.getEnabledSpellCheckers();
+        SpellCheckerInfo[] scInfos =
+                mTextServiceManager == null ? null : mTextServiceManager.getEnabledSpellCheckers();
         if (scInfos != null) {
             for (SpellCheckerInfo scInfo : scInfos) {
                 if (scInfo.getServiceInfo().applicationInfo.uid == callingUid