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

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

Snap for 13264465 from 36664cac to 25Q2-release 

Change-Id: I2d2ffedb127105eb47bb1ab7c041e167c268c6e5
parents 818ee5bc 36664cac

proto/src/persist_atoms.proto

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ message CellularServiceState { 
    optional bool is_iwlan_cross_sim = 15;

    optional bool is_ntn = 16;

    optional bool is_nb_iot_ntn = 17;

    optional bool is_opportunistic = 18;



    // Internal use only

    optional int64 last_used_millis = 10001;
@@ -453,6 +454,7 @@ message CellularDataServiceSwitch { 
    optional bool is_multi_sim = 4;

    optional int32 carrier_id = 5;

    optional int32 switch_count = 6;

    optional bool is_opportunistic = 7;



    // Internal use only

    optional int64 last_used_millis = 10001;

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

+4 −2
Original line number Diff line number Diff line
@@ -1064,7 +1064,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                serviceSwitch.simSlotIndex,

                serviceSwitch.isMultiSim,

                serviceSwitch.carrierId,

                serviceSwitch.switchCount);

                serviceSwitch.switchCount,

                serviceSwitch.isOpportunistic);

    }



    private static StatsEvent buildStatsEvent(CellularServiceState state) {
@@ -1087,7 +1088,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                state.isDataEnabled,

                state.isIwlanCrossSim,

                state.isNtn,

                state.isNbIotNtn);

                state.isNbIotNtn,

                state.isOpportunistic);

    }



    private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {

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

+4 −2
Original line number Diff line number Diff line
@@ -2013,7 +2013,8 @@ public class PersistAtomsStorage { 
                    && state.isDataEnabled == key.isDataEnabled

                    && state.isIwlanCrossSim == key.isIwlanCrossSim

                    && state.isNtn == key.isNtn

                    && state.isNbIotNtn == key.isNbIotNtn) {

                    && state.isNbIotNtn == key.isNbIotNtn

                    && state.isOpportunistic == key.isOpportunistic) {

                return state;

            }

        }
@@ -2030,7 +2031,8 @@ public class PersistAtomsStorage { 
                    && serviceSwitch.ratTo == key.ratTo

                    && serviceSwitch.simSlotIndex == key.simSlotIndex

                    && serviceSwitch.isMultiSim == key.isMultiSim

                    && serviceSwitch.carrierId == key.carrierId) {

                    && serviceSwitch.carrierId == key.carrierId

                    && serviceSwitch.isOpportunistic == key.isOpportunistic) {

                return serviceSwitch;

            }

        }

src/java/com/android/internal/telephony/satellite/DatagramController.java

+5 −5
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ import android.os.Build; 
import android.os.Looper;

import android.os.SystemProperties;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.satellite.ISatelliteDatagramCallback;

import android.telephony.satellite.SatelliteDatagram;

import android.telephony.satellite.SatelliteManager;

import android.util.Log;



import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;
@@ -682,22 +682,22 @@ public class DatagramController { 
    }



    private static void logd(@NonNull String log) {

        Rlog.d(TAG, log);

        Log.d(TAG, log);

    }



    private static void loge(@NonNull String log) {

        Rlog.e(TAG, log);

        Log.e(TAG, log);

    }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        Log.d(TAG, log);

        if (mPersistentLogger != null) {

            mPersistentLogger.debug(TAG, log);

        }

    }



    private void ploge(@NonNull String log) {

        Rlog.e(TAG, log);

        Log.e(TAG, log);

        if (mPersistentLogger != null) {

            mPersistentLogger.error(TAG, log);

        }

src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java

+6 −7
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.Message;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.satellite.SatelliteDatagram;

import android.telephony.satellite.SatelliteManager;

import android.telephony.satellite.SatelliteSessionStats;
@@ -1418,31 +1417,31 @@ public class DatagramDispatcher extends Handler { 
    }



    private static void logd(@NonNull String log) {

        Rlog.d(TAG, log);

        Log.d(TAG, log);

    }



    private static void loge(@NonNull String log) {

        Rlog.e(TAG, log);

        Log.e(TAG, log);

    }



    private static void logw(@NonNull String log) { Rlog.w(TAG, log); }

    private static void logw(@NonNull String log) { Log.w(TAG, log); }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        Log.d(TAG, log);

        if (mPersistentLogger != null) {

            mPersistentLogger.debug(TAG, log);

        }

    }



    private void plogw(@NonNull String log) {

        Rlog.w(TAG, log);

        Log.w(TAG, log);

        if (mPersistentLogger != null) {

            mPersistentLogger.warn(TAG, log);

        }

    }



    private void ploge(@NonNull String log) {

        Rlog.e(TAG, log);

        Log.e(TAG, log);

        if (mPersistentLogger != null) {

            mPersistentLogger.error(TAG, log);

        }