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

Commit 8db50b7e authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-team Robot
Browse files

Check PackageManager before getting system service 

Fixes: 131285189

Test: manual
Change-Id: I17f4db85afc5969c58a0a08667ef05786302712b
(cherry picked from commit acc340d6)
parent 1266e9ed

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

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.content.Context; 
import android.hardware.face.FaceManager;

import android.provider.Settings;



import com.android.settings.Utils;



import androidx.preference.Preference;



/**
@@ -40,7 +42,7 @@ public class FaceSettingsAppPreferenceController extends FaceSettingsPreferenceC 


    public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        mFaceManager = context.getSystemService(FaceManager.class);

        mFaceManager = Utils.getFaceManagerOrNull(context);

    }



    public FaceSettingsAppPreferenceController(Context context) {

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

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.provider.Settings; 


import androidx.preference.Preference;



import com.android.settings.Utils;

import com.android.settings.core.TogglePreferenceController;



/**
@@ -46,7 +47,7 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere 
    public FaceSettingsConfirmPreferenceController(Context context,

            String preferenceKey) {

        super(context, preferenceKey);

        mFaceManager = context.getSystemService(FaceManager.class);

        mFaceManager = Utils.getFaceManagerOrNull(context);

    }



    @Override

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

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.provider.Settings; 


import androidx.preference.Preference;



import com.android.settings.Utils;

import com.android.settings.core.TogglePreferenceController;



/**
@@ -44,7 +45,7 @@ public class FaceSettingsKeyguardPreferenceController extends FaceSettingsPrefer 


    public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        mFaceManager = context.getSystemService(FaceManager.class);

        mFaceManager = Utils.getFaceManagerOrNull(context);

    }



    public FaceSettingsKeyguardPreferenceController(Context context) {