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

Commit 19429041 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge changes I32306fb8,Ic06c4535,I70c26232 into udc-dev-plus-aosp am: 02add5fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24537169



Change-Id: Ib61f1c1b852df441f4895a91319984b73f47572d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7281f661 02add5fc

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

+39 −14
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import java.util.NoSuchElementException; 
import java.util.Objects;

import java.util.Set;





/**

 * A class that manages a user's synthetic password (SP) ({@link #SyntheticPassword}), along with a

 * set of SP protectors that are independent ways that the SP is protected.
@@ -547,11 +546,40 @@ class SyntheticPasswordManager { 
        }

    }



    private @Nullable IWeaver getWeaverServiceInternal() {

        // Try to get the AIDL service first

    private @Nullable IWeaver getWeaverAidlService() {

        final IWeaver aidlWeaver;

        try {

            IWeaver aidlWeaver = IWeaver.Stub.asInterface(

            aidlWeaver =

                    IWeaver.Stub.asInterface(

                            ServiceManager.waitForDeclaredService(IWeaver.DESCRIPTOR + "/default"));

        } catch (SecurityException e) {

            Slog.w(TAG, "Does not have permissions to get AIDL weaver service");

            return null;

        }

        if (aidlWeaver == null) {

            return null;

        }

        final int aidlVersion;

        try {

            aidlVersion = aidlWeaver.getInterfaceVersion();

        } catch (RemoteException e) {

            Slog.e(TAG, "Cannot get AIDL weaver service version", e);

            return null;

        }

        if (aidlVersion < 2) {

            Slog.w(TAG,

                    "Ignoring AIDL weaver service v"

                            + aidlVersion

                            + " because only v2 and later are supported");

            return null;

        }

        Slog.i(TAG, "Found AIDL weaver service v" + aidlVersion);

        return aidlWeaver;

    }



    private @Nullable IWeaver getWeaverServiceInternal() {

        // Try to get the AIDL service first

        IWeaver aidlWeaver = getWeaverAidlService();

        if (aidlWeaver != null) {

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

            try {
@@ -561,9 +589,6 @@ class SyntheticPasswordManager { 
            }

            return aidlWeaver;

        }

        } catch (SecurityException e) {

            Slog.w(TAG, "Does not have permissions to get AIDL weaver service");

        }



        // If the AIDL service can't be found, look for the HIDL service

        try {