Merge changes I7070326d,I8346e53c

am: 546073a5b6

Change-Id: I4ca0a1ebf9240d81dbbf966fd2ceae3c2bd39a2c

keystore/OWNERS

@@ -0,0 +1,4 @@
+jbires@google.com
+jdanis@google.com
+robbarnes@google.com
+swillden@google.com

services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java

@@ -95,10 +95,22 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub {
         mIsShowing = showing;
 
         mCallback.onShowingChanged();
-        try {
+        int retry = 2;
-            mKeystoreService.onKeyguardVisibilityChanged(showing, mCurrentUserId);
+        while (retry > 0) {
-        } catch (RemoteException e) {
+            try {
-            Slog.e(TAG, "Error informing keystore of screen lock", e);
+                mKeystoreService.onKeyguardVisibilityChanged(showing, mCurrentUserId);
+                break;
+            } catch (RemoteException e) {
+                if (retry == 2) {
+                    Slog.w(TAG, "Error informing keystore of screen lock. Keystore may have died"
+                            + " -> refreshing service token and retrying");
+                    mKeystoreService = IKeystoreService.Stub.asInterface(ServiceManager
+                            .getService("android.security.keystore"));
+                } else {
+                    Slog.e(TAG, "Error informing keystore of screen lock after retrying once", e);
+                }
+                --retry;
+            }
         }
     }