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

Commit b092882d authored by Hai Zhang's avatar Hai Zhang
Browse files

Correctly determine emergency role availability. 

Report emergency role availability according to
TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED as well.

Bug: 124452117
Test: build
Change-Id: Ib96a04ce15aaa24f7aa772b652a5cd2ea0e1a2b4
parent 75e3e174

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
    <uses-permission android:name="android.permission.APPROVE_INCIDENT_REPORTS" />

    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />

    <uses-permission android:name="android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS" />

    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />



    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />

src/com/android/packageinstaller/role/model/EmergencyRoleBehavior.java

+1 −3
Original line number Diff line number Diff line
@@ -41,10 +41,8 @@ public class EmergencyRoleBehavior implements RoleBehavior { 
    @Override

    public boolean isAvailableAsUser(@NonNull Role role, @NonNull UserHandle user,

            @NonNull Context context) {

        // TODO: STOPSHIP: Also TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED, and a boolean

        //  constant to disable UI by default.

        TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);

        return telephonyManager.isVoiceCapable();

        return telephonyManager.isEmergencyAssistanceEnabled() && telephonyManager.isVoiceCapable();

    }



    @Nullable