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

Commit 7d9e7c98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"

parents a3da7f92 7b9d34a8

proto/src/telephony.proto

+9 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ message TelephonyLog { 


  // Modem power stats

  optional ModemPowerStats modem_power_stats = 8;



  // Hardware revision (EVT, DVT, PVT etc.)

  optional string hardware_revision = 9;

}



// The time information
@@ -1433,6 +1436,12 @@ message SmsSession { 


      // Service category of CB message

      optional int32 service_category = 4;



      // Message's serial number

      optional int32 serial_number = 5;



      // The delivered time (UTC) of the message

      optional int64 delivered_timestamp_millis = 6;

    }



    enum CBMessageType {

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

+2 −1
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ public class CellBroadcastHandler extends WakeLockStateMachine { 
        TelephonyMetrics metrics = TelephonyMetrics.getInstance();

        metrics.writeNewCBSms(mPhone.getPhoneId(), message.getMessageFormat(),

                message.getMessagePriority(), message.isCmasMessage(), message.isEtwsMessage(),

                message.getServiceCategory());

                message.getServiceCategory(), message.getSerialNumber(),

                System.currentTimeMillis());



        String msg;

        Intent intent;

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

+11 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static com.android.internal.telephony.nano.TelephonyProto.PdpType.PDP_UNK 
import android.hardware.radio.V1_0.SetupDataCallResult;

import android.os.Build;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.SmsManager;
@@ -450,6 +451,7 @@ public class TelephonyMetrics { 
                + "rx signal strength levels (ms): "

                + Arrays.toString(s.timeInRxSignalStrengthLevelMs));

        pw.decreaseIndent();

        pw.println("Hardware Version: " + SystemProperties.get("ro.boot.revision", ""));

    }



    /**
@@ -546,6 +548,9 @@ public class TelephonyMetrics { 
        // Build modem power metrics

        log.modemPowerStats = new ModemPowerMetrics().buildProto();



        // Log the hardware revision

        log.hardwareRevision = SystemProperties.get("ro.boot.revision", "");



        // Log the starting system time

        log.startTime = new TelephonyProto.Time();

        log.startTime.systemTimestampMillis = mStartSystemTimeMs;
@@ -1863,9 +1868,12 @@ public class TelephonyMetrics { 
     * @param isCMAS true if msg is CMAS

     * @param isETWS true if msg is ETWS

     * @param serviceCategory Service category of CB msg

     * @param serialNumber Serial number of the message

     * @param deliveredTimestamp Message's delivered timestamp

     */

    public synchronized void writeNewCBSms(int phoneId, int format, int priority, boolean isCMAS,

                                           boolean isETWS, int serviceCategory) {

                                           boolean isETWS, int serviceCategory, int serialNumber,

                                           long deliveredTimestamp) {

        InProgressSmsSession smsSession = startNewSmsSessionIfNeeded(phoneId);



        int type;
@@ -1882,6 +1890,8 @@ public class TelephonyMetrics { 
        cbm.msgPriority = priority + 1;

        cbm.msgType = type;

        cbm.serviceCategory = serviceCategory;

        cbm.serialNumber = serialNumber;

        cbm.deliveredTimestampMillis = deliveredTimestamp;



        smsSession.addEvent(new SmsSessionEventBuilder(SmsSession.Event.Type.CB_SMS_RECEIVED)

                .setCellBroadcastMessage(cbm)