am bff393ce: Fix NPE in AccountSettingsFragment.

* commit 'bff393ce13554588d3906df4e5f464199acb23ae':
  Fix NPE in AccountSettingsFragment.

1 files changed, 15 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java b/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
index f0d6d081e..1bd8f314c 100644
--- a/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
@@ -23,6 +23,8 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
+import com.android.inputmethod.annotations.UsedForTesting;
+
 import java.util.List;
 
 /**
@@ -32,16 +34,28 @@ public class ManagedProfileUtils {
     private static final boolean DEBUG = false;
     private static final String TAG = ManagedProfileUtils.class.getSimpleName();
 
+    private static ManagedProfileUtils INSTANCE = new ManagedProfileUtils();
+    private static ManagedProfileUtils sTestInstance;
+
     private ManagedProfileUtils() {
         // This utility class is not publicly instantiable.
     }
 
+    @UsedForTesting
+    public static void setTestInstance(final ManagedProfileUtils testInstance) {
+        sTestInstance = testInstance;
+    }
+
+    public static ManagedProfileUtils getInstance() {
+        return sTestInstance == null ? INSTANCE : sTestInstance;
+    }
+
     /**
      * Note that {@link UserManager#getUserProfiles} has been introduced
      * in API level 21 (Build.VERSION_CODES.LOLLIPOP).
      */
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public static boolean hasManagedWorkProfile(final Context context) {
+    public boolean hasManagedWorkProfile(final Context context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             return false;
         }