Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a545e8dd authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Fix: NPE when context.getFilesDir() returns null. 

Bug: 14517587
Change-Id: Ib99bea14eab3a25ddb5042527b757133734a6ba6
parent d94567d9

java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java

+6 −4
Original line number Diff line number Diff line
@@ -138,11 +138,13 @@ public class PersonalizationHelper { 
                }

            }

            dictionaryMap.clear();

            if (!FileUtils.deleteFilteredFiles(

                    context.getFilesDir(), new DictFilter(dictNamePrefix))) {

            final File filesDir = context.getFilesDir();

            if (filesDir == null) {

                Log.e(TAG, "context.getFilesDir() returned null.");

            }

            if (!FileUtils.deleteFilteredFiles(filesDir, new DictFilter(dictNamePrefix))) {

                Log.e(TAG, "Cannot remove all existing dictionary files. filesDir: "

                        + context.getFilesDir().getAbsolutePath() + ", dictNamePrefix: "

                        + dictNamePrefix);

                        + filesDir.getAbsolutePath() + ", dictNamePrefix: " + dictNamePrefix);

            }

        }

    }