Merge "Check FaceManager before get system service"
This commit is contained in:
committed by
Android (Google) Code Review
commit
eb97f54928
@@ -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());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user