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

Commit 5b21e30b authored by Eric Biggers's avatar Eric Biggers
Browse files

Reconnect if weaver service connection dies 

For robustness reasons, reconnect to the Weaver service if it dies.
This should not be relied on, but it's easy to do and is the same thing
that LockSettingsService does for the Gatekeeper service.

Bug: 287705522
Test: Treehugger
Change-Id: Ic06c45353c6b7282e2f22eef13ea1c6e36fe5c58
parent 922aaa24

services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java

+22 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.hardware.weaver.IWeaver; 
import android.hardware.weaver.WeaverConfig;

import android.hardware.weaver.WeaverReadResponse;

import android.hardware.weaver.WeaverReadStatus;

import android.os.IBinder;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -505,7 +506,7 @@ class SyntheticPasswordManager { 


    private final Context mContext;

    private LockSettingsStorage mStorage;

    private IWeaver mWeaver;

    private volatile IWeaver mWeaver;

    private WeaverConfig mWeaverConfig;

    private PasswordSlotManager mPasswordSlotManager;
@@ -536,6 +537,21 @@ class SyntheticPasswordManager { 
        }

    }



    private class WeaverDiedRecipient implements IBinder.DeathRecipient {

        // Not synchronized on the outer class, since setting the pointer to null is atomic, and we

        // don't want to have to worry about any sort of deadlock here.

        @Override

        public void binderDied() {

            // Weaver died.  Try to recover by setting mWeaver to null, which makes

            // getWeaverService() look up the service again.  This is done only as a simple

            // robustness measure; it should not be relied on.  If this triggers, the root cause is

            // almost certainly a bug in the device's Weaver implementation, which must be fixed.

            Slog.wtf(TAG, "Weaver service has died");

            mWeaver.asBinder().unlinkToDeath(this, 0);

            mWeaver = null;

        }

    }



    private @Nullable IWeaver getWeaverServiceInternal() {

        // Try to get the AIDL service first

        try {
@@ -543,6 +559,11 @@ class SyntheticPasswordManager { 
                    ServiceManager.waitForDeclaredService(IWeaver.DESCRIPTOR + "/default"));

            if (aidlWeaver != null) {

                Slog.i(TAG, "Using AIDL weaver service");

                try {

                    aidlWeaver.asBinder().linkToDeath(new WeaverDiedRecipient(), 0);

                } catch (RemoteException e) {

                    Slog.w(TAG, "Unable to register Weaver death recipient", e);

                }

                return aidlWeaver;

            }

        } catch (SecurityException e) {