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

Fix Settings crash

Browse Source 
Fixes: 136788181
Test: adb shell am start -a android.settings.FACE_SETTINGS will not
      crash

Change-Id: I10168ce83ceb8646dce5d5e086b14ca2e3ed8284
This commit is contained in:
Raff Tsai
2019-07-11 11:29:37 +08:00
parent cde0fa3f85
commit a99a85fdf3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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