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

Commit 7b757001 authored by Pengquan Meng's avatar Pengquan Meng Committed by Android (Google) Code Review
Browse files

Merge "Fix out of index issue for telephonyMetrics"

parents 4295b90e f65af671

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

+10 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.telephony.metrics; 
import static com.android.internal.telephony.nano.TelephonyProto.ImsCapabilities;

import static com.android.internal.telephony.nano.TelephonyProto.ImsConnectionState;

import static com.android.internal.telephony.nano.TelephonyProto.RilDataCall;

import static com.android.internal.telephony.nano.TelephonyProto.SimState;

import static com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent;

import static com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.CarrierIdMatching;

import static com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.CarrierKeyChange;
@@ -30,6 +31,7 @@ import static com.android.internal.telephony.nano.TelephonyProto.TelephonyServic 
import static com.android.internal.telephony.nano.TelephonyProto.TelephonySettings;



import android.os.SystemClock;

import android.telephony.TelephonyManager;

import android.util.SparseArray;



import com.android.internal.telephony.nano.TelephonyProto.ActiveSubscriptionInfo;
@@ -37,6 +39,8 @@ import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.DataSwi 
import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.OnDemandDataSwitch;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent.Type;



import java.util.Arrays;



public class TelephonyEventBuilder {

    private final TelephonyEvent mEvent = new TelephonyEvent();
@@ -147,12 +151,16 @@ public class TelephonyEventBuilder { 


    /** Set and build SIM state change event. */

    public TelephonyEventBuilder setSimStateChange(SparseArray<Integer> simStates) {

        int phoneCount = TelephonyManager.getDefault().getPhoneCount();

        mEvent.simState = new int[phoneCount];

        Arrays.fill(mEvent.simState, SimState.SIM_STATE_UNKNOWN);

        mEvent.type = Type.SIM_STATE_CHANGED;

        mEvent.simState = new int[simStates.size()];

        for (int i = 0; i < simStates.size(); i++) {

            int key = simStates.keyAt(i);

            if (0 <= key && key < phoneCount) {

                mEvent.simState[key] = simStates.get(key);

            }

        }

        return this;

    }