Clean up aconfig flag satellite_persist_logging
Bug: 393951373
FLAG: EXEMPT flag clean up
Test: atest SatelliteAccessControllerTest
Change-Id: Ia348ba6cbf039b8f8090a493e8d7841a3346b2be
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index b490b35..6b4d35f 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -75,7 +75,6 @@
import android.telecom.TelecomManager;
import android.telephony.AnomalyReporter;
import android.telephony.CarrierConfigManager;
-import android.telephony.DropBoxManagerLoggerBackend;
import android.telephony.NetworkRegistrationInfo;
import android.telephony.PersistentLogger;
import android.telephony.Rlog;
@@ -106,6 +105,7 @@
import com.android.internal.telephony.satellite.SatelliteConfig;
import com.android.internal.telephony.satellite.SatelliteConstants;
import com.android.internal.telephony.satellite.SatelliteController;
+import com.android.internal.telephony.satellite.SatelliteServiceUtils;
import com.android.internal.telephony.satellite.metrics.AccessControllerMetricsStats;
import com.android.internal.telephony.satellite.metrics.ConfigUpdaterMetricsStats;
import com.android.internal.telephony.satellite.metrics.ControllerMetricsStats;
@@ -497,10 +497,7 @@
@Nullable File s2CellFile) {
super(looper);
mContext = context;
- if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {
- mPersistentLogger = new PersistentLogger(
- DropBoxManagerLoggerBackend.getInstance(context));
- }
+ mPersistentLogger = SatelliteServiceUtils.getPersistentLogger(context);
mFeatureFlags = featureFlags;
mLocationManager = locationManager;
mTelecomManager = telecomManager;
@@ -3194,19 +3191,6 @@
Rlog.v(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;
- }
- }
-
/**
* This API can be used only for test purpose to override the carrier roaming Ntn eligibility
*
diff --git a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
index 12d848c..196f64c 100644
--- a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
+++ b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
@@ -421,7 +421,6 @@
.putInt(anyString(), anyInt());
doNothing().when(mMockSharedPreferencesEditor).apply();
- when(mMockFeatureFlags.satellitePersistentLogging()).thenReturn(true);
when(mMockFeatureFlags.geofenceEnhancementForBetterUx()).thenReturn(true);
when(mMockFeatureFlags.carrierRoamingNbIotNtn()).thenReturn(true);