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

Commit 74968249 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

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
parents 90929359 89a6b21f

flags/misc.aconfig

+8 −19
Original line number Diff line number Diff line
@@ -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"

src/java/com/android/internal/telephony/Phone.java

+1 −3
Original line number Diff line number Diff line
@@ -671,10 +671,8 @@ 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);

    }

    }



    /**

     * Start setup of ImsPhone, which will start trying to connect to the ImsResolver. Will not be