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

Commit ae97818d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9465878 from 707acc55 to tm-qpr2-release 

Change-Id: I9a9a50aed30c3200b5946f26f80249ae9f263427
parents d6724a73 707acc55

src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java

+2 −1
Original line number Diff line number Diff line
@@ -305,7 +305,8 @@ public class VisualVoicemailSmsFilter { 
             * received message. However, the message is most likely encoded with UTF-8. Therefore,

             * we need to retry decoding the received message with UTF-8.

             */

            if ((body == null || message.getReceivedEncodingType() == ENCODING_8BIT)

            if ((body == null || (message.is3gpp()

                    && message.getReceivedEncodingType() == ENCODING_8BIT))

                    && message.getUserData() != null) {

                Log.d(TAG, "getFullMessage decode using UTF-8");

                // Attempt to interpret the user data as UTF-8. UTF-8 string over data SMS using

src/java/com/android/internal/telephony/metrics/ServiceStateStats.java

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@ public class ServiceStateStats { 
            case TelephonyManager.NETWORK_TYPE_LTE_CA:

                band = AccessNetworkUtils.getOperatingBandForEarfcn(chNumber);

                break;

            case TelephonyManager.NETWORK_TYPE_NR:

                band = AccessNetworkUtils.getOperatingBandForNrarfcn(chNumber);

                break;

            default:

                Rlog.w(TAG, "getBand: unknown WWAN RAT " + rat);

                band = 0;