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

Commit ddd56e4b authored by Patrick Huang's avatar Patrick Huang Committed by Android (Google) Code Review
Browse files

Merge "Hide lockscreen Emergency button if device lacks telephony" into tm-dev

parents 687af63e 448db3a8

packages/SystemUI/src/com/android/keyguard/EmergencyButton.java

+3 −3
Original line number Diff line number Diff line
@@ -107,10 +107,10 @@ public class EmergencyButton extends Button { 
        return super.performLongClick();

    }



    void updateEmergencyCallButton(boolean isInCall, boolean isVoiceCapable, boolean simLocked) {

    void updateEmergencyCallButton(boolean isInCall, boolean hasTelephonyRadio, boolean simLocked) {

        boolean visible = false;

        if (isVoiceCapable) {

            // Emergency calling requires voice capability.

        if (hasTelephonyRadio) {

            // Emergency calling requires a telephony radio.

            if (isInCall) {

                visible = true; // always show "return to call" if phone is off-hook

            } else {

packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.systemui.DejankUtils.whitelistIpcs; 
import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.os.PowerManager;

import android.os.SystemClock;
@@ -116,7 +117,8 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { 
        if (mView != null) {

            mView.updateEmergencyCallButton(

                    mTelecomManager != null && mTelecomManager.isInCall(),

                    mTelephonyManager.isVoiceCapable(),

                    getContext().getPackageManager().hasSystemFeature(

                            PackageManager.FEATURE_TELEPHONY),

                    mKeyguardUpdateMonitor.isSimPinVoiceSecure());

        }

    }