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

Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905

Change-Id: Ibf1b7ccf19781d8caa1bb27e335be2367a6fb658
This commit is contained in:
Chalard Jean
2021-03-19 01:46:23 +00:00
committed by Automerger Merge Worker
parent 23511a3eba 6df94880b3
commit 318bbccc3e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/policy/LegacyGlobalActions.java
View File

@@ -24,11 +24,11 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.media.AudioManager; import android.media.AudioManager;
import android.net.ConnectivityManager;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
@@ -113,7 +113,7 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn
private boolean mDeviceProvisioned = false; private boolean mDeviceProvisioned = false;
private ToggleAction.State mAirplaneState = ToggleAction.State.Off; private ToggleAction.State mAirplaneState = ToggleAction.State.Off;
private boolean mIsWaitingForEcmExit = false; private boolean mIsWaitingForEcmExit = false;
private boolean mHasTelephony; private final boolean mHasTelephony;
private boolean mHasVibrator; private boolean mHasVibrator;
private final boolean mShowSilentToggle; private final boolean mShowSilentToggle;
private final EmergencyAffordanceManager mEmergencyAffordanceManager; private final EmergencyAffordanceManager mEmergencyAffordanceManager;
@@ -137,9 +137,8 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn
filter.addAction(TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED); filter.addAction(TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
context.registerReceiver(mBroadcastReceiver, filter); context.registerReceiver(mBroadcastReceiver, filter);
ConnectivityManager cm = (ConnectivityManager) mHasTelephony =
context.getSystemService(Context.CONNECTIVITY_SERVICE); context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
mHasTelephony = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
// get notified of phone state changes // get notified of phone state changes
TelephonyManager telephonyManager = TelephonyManager telephonyManager =