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

Commit 53895b42 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Don't send selected satellite subscription ID changed when there is no change" into main

parents de83bcf1 58a68fe1

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);

        }

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

+7 −7
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ import android.os.Message; 
import android.os.RemoteException;

import android.provider.Telephony;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.telephony.satellite.ISatelliteDatagramCallback;

import android.telephony.satellite.SatelliteDatagram;

import android.telephony.satellite.SatelliteManager;

import android.util.Log;

import android.util.Pair;



import com.android.internal.R;
@@ -892,33 +892,33 @@ public class DatagramReceiver 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);

        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);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.internal.telephony.satellite; 


import android.annotation.NonNull;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.Rlog;

import android.text.TextUtils;

import android.util.Log;



import java.util.List;
@@ -60,6 +60,6 @@ public class NtnCapabilityResolver { 
    }



    private static void logd(@NonNull String log) {

        Rlog.d(TAG, log);

        Log.d(TAG, log);

    }

}

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

+5 −5
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ import android.os.RemoteException; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.telephony.satellite.ISatelliteTransmissionUpdateCallback;

import android.telephony.satellite.PointingInfo;

import android.telephony.satellite.SatelliteManager;

import android.text.TextUtils;

import android.util.Log;



import com.android.internal.R;

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



    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);

        }