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

Commit b4ec67a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TelephonyManager: use isDeviceVoiceCapable" into main

parents 012cb8b6 a9ec44ed

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ public class TelephonyManager { 
            case UNKNOWN:

                modemCount = 1;

                // check for voice and data support, 0 if not supported

                if (!isVoiceCapable() && !isSmsCapable() && !isDataCapable()) {

                if (!isDeviceVoiceCapable() && !isSmsCapable() && !isDataCapable()) {

                    modemCount = 0;

                }

                break;
@@ -2814,7 +2814,7 @@ public class TelephonyManager { 
     */

    @RequiresFeature(PackageManager.FEATURE_TELEPHONY)

    public int getPhoneType() {

        if (!isVoiceCapable() && !isDataCapable()) {

        if (!isDeviceVoiceCapable() && !isDataCapable()) {

            return PHONE_TYPE_NONE;

        }

        return getCurrentPhoneType();