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

Merge "Use TelephonyManager API to check if device is voice capable." am: c5480019ce am: 8bdcb6c2ce

Browse Source 
Change-Id: I4aeee332f002f7777a94c50b85b4601bfec55108
This commit is contained in:
Automerger Merge Worker
2019-12-13 23:52:55 +00:00
parent 1e59170bd8 8bdcb6c2ce
commit b083edb7ad
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/AudioSystem.java
View File

@@ -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
* </ul>
*/
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;

10
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

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

3
packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
View File

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

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

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