PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check FaceManager before get system service

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

Change-Id: If727ab4aa3b4043fa2e4e8c13392e32d566b1bbb
This commit is contained in:
Raff Tsai
2019-07-12 12:15:01 +08:00
parent 0eeb83c0f8
commit b848474b91
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -114,16 +114,16 @@ public class FaceSettings extends DashboardFragment {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final Context context = getPrefContext(); final Context context = getPrefContext();
mUserManager = context.getSystemService(UserManager.class);
mFaceManager = context.getSystemService(FaceManager.class);
mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
if (!isAvailable(context)) { if (!isAvailable(context)) {
Log.w(TAG, "no faceManager, finish this"); Log.w(TAG, "no faceManager, finish this");
finish(); finish();
return; return;
} }
mUserManager = context.getSystemService(UserManager.class);
mFaceManager = context.getSystemService(FaceManager.class);
mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
mUserId = getActivity().getIntent().getIntExtra( mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId()); Intent.EXTRA_USER_ID, UserHandle.myUserId());