Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Patrick Huang
2022-03-07 15:48:11 +00:00
committed by Android (Google) Code Review
parent 687af63e66 448db3a894
commit ddd56e4b19
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/keyguard/EmergencyButton.java
View File

@@ -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 {

4
packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java
View File

@@ -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());
}
}