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

Commit 5dbecd9d authored by Michele's avatar Michele
Browse files

Use TelephonyManager API to check if device is voice capable. 

Bug: 146075164
Test: make
Change-Id: I3f19a65012ea355091bbbf22ee3c11054ed19e37
parent 700c836e

media/java/android/media/AudioSystem.java

+3 −1
Original line number Diff line number Diff line
@@ -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;
@@ -1246,7 +1247,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;

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+6 −3
Original line number Diff line number Diff line
@@ -951,8 +951,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='"
@@ -2548,7 +2547,7 @@ class DatabaseHelper extends SQLiteOpenHelper { 
            StringBuilder val = new StringBuilder();

            List<Integer> defaultNetworks = TelephonyProperties.default_network();

            int phoneCount = 1;

            TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);

            TelephonyManager telephonyManager = getTelephonyManager();

            if (telephonyManager != null) {

                phoneCount = telephonyManager.getSupportedModemCount();

            }
@@ -2663,4 +2662,8 @@ 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);

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -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;

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

+6 −2
Original line number Diff line number Diff line
@@ -28,6 +28,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;
@@ -86,13 +87,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();