diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 3455c4f01ff92..1033e56776b9d 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.media.audiofx.AudioEffect; import android.media.audiopolicy.AudioMix; +import android.telephony.TelephonyManager; import android.util.Log; import java.lang.annotation.Retention; @@ -1239,7 +1240,8 @@ public class AudioSystem * */ public static int getPlatformType(Context context) { - if (context.getResources().getBoolean(com.android.internal.R.bool.config_voice_capable)) { + if (((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)) + .isVoiceCapable()) { return PLATFORM_VOICE; } else if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { return PLATFORM_TELEVISION; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 5e2b7c86ee934..6821942111f17 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -949,8 +949,7 @@ class DatabaseHelper extends SQLiteOpenHelper { (1 << AudioManager.STREAM_NOTIFICATION) | (1 << AudioManager.STREAM_SYSTEM) | (1 << AudioManager.STREAM_SYSTEM_ENFORCED); - if (!mContext.getResources().getBoolean( - com.android.internal.R.bool.config_voice_capable)) { + if (!getTelephonyManager().isVoiceCapable()) { ringerModeAffectedStreams |= (1 << AudioManager.STREAM_MUSIC); } db.execSQL("DELETE FROM system WHERE name='" @@ -2579,7 +2578,7 @@ class DatabaseHelper extends SQLiteOpenHelper { String val = ""; String mode; for (int phoneId = 0; - phoneId < TelephonyManager.getDefault().getPhoneCount(); phoneId++) { + phoneId < getTelephonyManager().getPhoneCount(); phoneId++) { mode = TelephonyManager.getTelephonyProperty(phoneId, "ro.telephony.default_network", Integer.toString(RILConstants.PREFERRED_NETWORK_MODE)); @@ -2693,4 +2692,9 @@ class DatabaseHelper extends SQLiteOpenHelper { private String getDefaultDeviceName() { return mContext.getResources().getString(R.string.def_device_name_simple, Build.MODEL); } + + private TelephonyManager getTelephonyManager() { + return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); + } + } diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java index 4dbca47c2f0aa..9d9cad825444e 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java @@ -163,8 +163,7 @@ public class CarrierTextController { public CarrierTextController(Context context, CharSequence separator, boolean showAirplaneMode, boolean showMissingSim) { mContext = context; - mIsEmergencyCallCapable = context.getResources().getBoolean( - com.android.internal.R.bool.config_voice_capable); + mIsEmergencyCallCapable = getTelephonyManager().isVoiceCapable(); mShowAirplaneMode = showAirplaneMode; mShowMissingSim = showMissingSim; diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java index 210b82d1d69c2..1acccf90c0eba 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java @@ -26,6 +26,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.telecom.TelecomManager; +import android.telephony.TelephonyManager; import android.util.AttributeSet; import android.util.Slog; import android.view.MotionEvent; @@ -92,13 +93,16 @@ public class EmergencyButton extends Button { public EmergencyButton(Context context, AttributeSet attrs) { super(context, attrs); - mIsVoiceCapable = context.getResources().getBoolean( - com.android.internal.R.bool.config_voice_capable); + mIsVoiceCapable = getTelephonyManager().isVoiceCapable(); mEnableEmergencyCallWhileSimLocked = mContext.getResources().getBoolean( com.android.internal.R.bool.config_enable_emergency_call_while_sim_locked); mEmergencyAffordanceManager = new EmergencyAffordanceManager(context); } + private TelephonyManager getTelephonyManager() { + return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); + } + @Override protected void onAttachedToWindow() { super.onAttachedToWindow();