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

Commit eb97f549 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check FaceManager before get system service"

parents 2c4edee7 b848474b

src/com/android/settings/biometrics/face/FaceSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -114,16 +114,16 @@ public class FaceSettings extends DashboardFragment { 
        super.onCreate(savedInstanceState);



        final Context context = getPrefContext();

        mUserManager = context.getSystemService(UserManager.class);

        mFaceManager = context.getSystemService(FaceManager.class);

        mToken = getIntent().getByteArrayExtra(KEY_TOKEN);



        if (!isAvailable(context)) {

            Log.w(TAG, "no faceManager, finish this");

            finish();

            return;

        }



        mUserManager = context.getSystemService(UserManager.class);

        mFaceManager = context.getSystemService(FaceManager.class);

        mToken = getIntent().getByteArrayExtra(KEY_TOKEN);



        mUserId = getActivity().getIntent().getIntExtra(

                Intent.EXTRA_USER_ID, UserHandle.myUserId());