commit 8f18dd4dfa45e27cd5dbe6135da1b5b4985283bb
author Amith Yamasani <yamasani@google.com> Fri Oct 30 18:19:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 30 18:19:08 2015 +0000
tree 6a312c09a7748887bf84a403c8b8ad1d030977a6
parent 030cfd3da697d51bf1bffd076881c12acedd851e
parent c0688301de5feea94c8456b3b9b42c41d0045f03

Merge "Don't store a static instance of UserManager"

core/java/android/os/UserManager.java

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 17e1a28..2e31ab6 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -533,14 +533,9 @@
     /** @hide */
     public static final int PIN_VERIFICATION_SUCCESS = -1;
 
-    private static UserManager sInstance = null;
-
     /** @hide */
-    public synchronized static UserManager get(Context context) {
-        if (sInstance == null) {
-            sInstance = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        }
-        return sInstance;
+    public static UserManager get(Context context) {
+        return (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
     /** @hide */