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

Commit 11505c8c authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Clean up aconfig flag satellite_persist_logging 

Bug: 393951373
FLAG: EXEMPT flag clean up
Test: atest SatelliteControllerTest DatagramReceiverTest DatagramDispatcherTest SatelliteSessionControllerTest
Change-Id: Ifc9f09e422ae81f4080e595aac9588997100d8b6
parent 43813a42

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

+1 −19
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.res.Resources; 
import android.os.Build;

import android.os.Looper;

import android.os.SystemProperties;

import android.telephony.DropBoxManagerLoggerBackend;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.satellite.ISatelliteDatagramCallback;
@@ -180,11 +179,7 @@ public class DatagramController { 
        mDatagramWaitTimeForConnectedStateForLastMessage =

                getDatagramWaitForConnectedStateForLastMessageTimeoutMillis();

        mDemoModeDatagramList = new ArrayList<>();



        if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {

            mPersistentLogger = new PersistentLogger(

                    DropBoxManagerLoggerBackend.getInstance(context));

        }

        mPersistentLogger = SatelliteServiceUtils.getPersistentLogger(context);

    }



    /**
@@ -694,19 +689,6 @@ public class DatagramController { 
        Rlog.e(TAG, log);

    }



    private boolean isSatellitePersistentLoggingEnabled(

            @NonNull Context context, @NonNull FeatureFlags featureFlags) {

        if (featureFlags.satellitePersistentLogging()) {

            return true;

        }

        try {

            return context.getResources().getBoolean(

                    R.bool.config_dropboxmanager_persistent_logging_enabled);

        } catch (RuntimeException e) {

            return false;

        }

    }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        if (mPersistentLogger != null) {

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

+2 −19
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NETW 
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE;

import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS;



import static com.android.internal.telephony.satellite.DatagramController.ROUNDING_UNIT;

import static com.android.internal.telephony.SmsDispatchersController.PendingRequest;

import static com.android.internal.telephony.satellite.DatagramController.ROUNDING_UNIT;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -39,7 +39,6 @@ import android.os.AsyncResult; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.telephony.DropBoxManagerLoggerBackend;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.satellite.SatelliteDatagram;
@@ -194,10 +193,7 @@ public class DatagramDispatcher extends Handler { 
        mDatagramController = datagramController;

        mControllerMetricsStats = ControllerMetricsStats.getInstance();

        mSessionMetricsStats = SessionMetricsStats.getInstance();

        if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {

            mPersistentLogger = new PersistentLogger(

                    DropBoxManagerLoggerBackend.getInstance(context));

        }

        mPersistentLogger = SatelliteServiceUtils.getPersistentLogger(context);



        synchronized (mLock) {

            mSendingInProgress = false;
@@ -1409,19 +1405,6 @@ public class DatagramDispatcher extends Handler { 


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



    private boolean isSatellitePersistentLoggingEnabled(

            @NonNull Context context, @NonNull FeatureFlags featureFlags) {

        if (featureFlags.satellitePersistentLogging()) {

            return true;

        }

        try {

            return context.getResources().getBoolean(

                    R.bool.config_dropboxmanager_persistent_logging_enabled);

        } catch (RuntimeException e) {

            return false;

        }

    }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        if (mPersistentLogger != null) {

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

+1 −18
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.Looper; 
import android.os.Message;

import android.os.RemoteException;

import android.provider.Telephony;

import android.telephony.DropBoxManagerLoggerBackend;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;
@@ -152,10 +151,7 @@ public class DatagramReceiver extends Handler { 
        mDatagramController = datagramController;

        mControllerMetricsStats = ControllerMetricsStats.getInstance();

        mSessionMetricsStats = SessionMetricsStats.getInstance();

        if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {

            mPersistentLogger = new PersistentLogger(

                    DropBoxManagerLoggerBackend.getInstance(context));

        }

        mPersistentLogger = SatelliteServiceUtils.getPersistentLogger(context);

        try {

            mSharedPreferences =

                    mContext.getSharedPreferences(SatelliteController.SATELLITE_SHARED_PREF,
@@ -907,19 +903,6 @@ public class DatagramReceiver extends Handler { 
        Rlog.w(TAG, log);

    }



    private boolean isSatellitePersistentLoggingEnabled(

            @NonNull Context context, @NonNull FeatureFlags featureFlags) {

        if (featureFlags.satellitePersistentLogging()) {

            return true;

        }

        try {

            return context.getResources().getBoolean(

                    R.bool.config_dropboxmanager_persistent_logging_enabled);

        } catch (RuntimeException e) {

            return false;

        }

    }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        if (mPersistentLogger != null) {

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

+1 −18
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.os.Message; 
import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.telephony.DropBoxManagerLoggerBackend;

import android.telephony.PersistentLogger;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;
@@ -122,10 +121,7 @@ public class PointingAppController { 
        mLastIsEmergency = false;

        mListenerForPointingUIRegistered = false;

        mActivityManager = mContext.getSystemService(ActivityManager.class);

        if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {

            mPersistentLogger = new PersistentLogger(

                    DropBoxManagerLoggerBackend.getInstance(context));

        }

        mPersistentLogger = SatelliteServiceUtils.getPersistentLogger(context);

    }



    /**
@@ -565,19 +561,6 @@ public class PointingAppController { 
        Rlog.e(TAG, log);

    }



    private boolean isSatellitePersistentLoggingEnabled(

            @NonNull Context context, @NonNull FeatureFlags featureFlags) {

        if (featureFlags.satellitePersistentLogging()) {

            return true;

        }

        try {

            return context.getResources().getBoolean(

                    R.bool.config_dropboxmanager_persistent_logging_enabled);

        } catch (RuntimeException e) {

            return false;

        }

    }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        if (mPersistentLogger != null) {

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

+1 −18
Original line number Diff line number Diff line
@@ -860,11 +860,7 @@ public class SatelliteController extends Handler { 
            @NonNull Context context, @NonNull Looper looper, @NonNull FeatureFlags featureFlags) {

        super(looper);



        if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {

            mPersistentLogger = new PersistentLogger(

                    DropBoxManagerLoggerBackend.getInstance(context));

        }



        mPersistentLogger = SatelliteServiceUtils.getPersistentLogger(context);

        mContext = context;

        mFeatureFlags = featureFlags;

        Phone phone = SatelliteServiceUtils.getPhone();
@@ -6935,19 +6931,6 @@ public class SatelliteController extends Handler { 
        Rlog.e(TAG, log);

    }



    private boolean isSatellitePersistentLoggingEnabled(

            @NonNull Context context, @NonNull FeatureFlags featureFlags) {

        if (featureFlags.satellitePersistentLogging()) {

            return true;

        }

        try {

            return context.getResources().getBoolean(

                    R.bool.config_dropboxmanager_persistent_logging_enabled);

        } catch (RuntimeException e) {

            return false;

        }

    }



    private void plogd(@NonNull String log) {

        Rlog.d(TAG, log);

        if (mPersistentLogger != null) {