Merge changes from topic "clean_up_roaming_notification_for_single_data_network" into main

* changes:
  Cleaned up the flag roaming_notification_for_single_data_network
  Cleaned up the flag enable_telephony_analytics

2 files changed, 9 insertions, 22 deletions

diff --git a/flags/misc.aconfig b/flags/misc.aconfig
index 17dffa4124..74e90a42b9 100644
--- a/flags/misc.aconfig
+++ b/flags/misc.aconfig
@@ -10,6 +10,14 @@ flag {
   is_fixed_read_only: true
 }
 
+# OWNER=tnd TARGET=24Q1
+flag {
+  name: "log_mms_sms_database_access_info"
+  namespace: "telephony"
+  description: "Whether to log MMS/SMS database access info and report anomaly when getting exception."
+  bug: "275225402"
+}
+
 # OWNER=tjstuart TARGET=24Q3
 flag {
   name: "stop_spamming_emergency_notification"
@@ -35,14 +43,6 @@ flag {
   bug: "309655251"
 }
 
-# OWNER=nagendranb TARGET=24Q3
-flag {
-  name: "enable_telephony_analytics"
-  namespace: "telephony"
-  description: "Enable Telephony Analytics information of Service State , Sms and Call scenarios"
-  bug: "309896524"
-}
-
 # OWNER=rambowang TARGET=24Q3
 flag {
     name: "reset_mobile_network_settings"
@@ -52,17 +52,6 @@ flag {
     bug:"271921464"
 }
 
-# OWNER=sangyun TARGET=24Q3
-flag {
-    name: "roaming_notification_for_single_data_network"
-    namespace: "telephony"
-    description: "Fix bug where roaming notification was not shown on a single data network."
-    bug:"249908996"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
 # OWNER=joonhunshin TARGET=24Q3
 flag {
     name: "enforce_telephony_feature_mapping"
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index c2a422d2cc..8451bed676 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -671,9 +671,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
             mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);
         }
         //Initialize Telephony Analytics
-        if (mFeatureFlags.enableTelephonyAnalytics()) {
-            mTelephonyAnalytics = new TelephonyAnalytics(this);
-        }
+        mTelephonyAnalytics = new TelephonyAnalytics(this);
     }
 
     /**