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

Commit b848474b authored by Raff Tsai's avatar Raff Tsai
Browse files

Check FaceManager before get system service 

Bug: 136788181
Test: adb shell am start -a android.settings.FACE_SETTINGS is not
      crashed

Change-Id: If727ab4aa3b4043fa2e4e8c13392e32d566b1bbb
parent 0eeb83c0

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());