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

Commit 546073a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I7070326d,I8346e53c 

* changes:
  Add OWNERS file to AndroidKeystoreSPI implementation
  KeyguardStateMonitor looses connection with keystore if keystore dies
parents cb906289 569055dd

keystore/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
jbires@google.com

jdanis@google.com

robbarnes@google.com

swillden@google.com

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

+16 −4
Original line number Diff line number Diff line
@@ -95,10 +95,22 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub { 
        mIsShowing = showing;



        mCallback.onShowingChanged();

        int retry = 2;

        while (retry > 0) {

            try {

                mKeystoreService.onKeyguardVisibilityChanged(showing, mCurrentUserId);

                break;

            } catch (RemoteException e) {

            Slog.e(TAG, "Error informing keystore of screen lock", 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;

            }

        }

    }