commit 1e7d8e0a7f25d485a3a88a64b1dfb9d3fb48e7a8
author The Android Automerger <android-build@google.com> Thu Nov 13 06:17:27 2014 -0800
committer The Android Automerger <android-build@google.com> Thu Nov 13 06:17:27 2014 -0800
tree 6a461ec33ed37944aa0c8296549f724aeba1bc7a
parent fc42f8df9752ae4ecb87fbea9ece3f65395785f0
parent 16104486171972a87a8c0c621f1e66540928fad5

merge in lmp-mr1-release history after reset to lmp-mr1-dev

Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java

diff --git a/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java b/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java
index 5b06291..fc39f32 100644
--- a/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java
+++ b/Settings/src/com/android/tv/settings/users/RestrictedProfileActivity.java
@@ -50,7 +50,6 @@
 
 import com.android.internal.widget.ILockSettings;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternUtilsCache;
 import com.android.tv.dialog.PinDialogFragment;
 
 import java.util.ArrayList;
@@ -375,8 +374,8 @@
 
     private ILockSettings getLockSettings() {
         if (mLockSettingsService == null) {
-            mLockSettingsService = LockPatternUtilsCache.getInstance(
-                    ILockSettings.Stub.asInterface(ServiceManager.getService("lock_settings")));
+            mLockSettingsService = ILockSettings.Stub.asInterface(
+                    ServiceManager.getService("lock_settings"));
         }
         return mLockSettingsService;
     }