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

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

Merge changes from topics "clean_up_... 

Merge changes from topics "clean_up_ dismiss_network_selection_notification_on_sim_disable", "clean_up_ reorganize_roaming_notification" into main

* changes:
  Cleaned up the flag dismiss_network_selection_notification_on_sim_disable
  Cleaned up the flag reorganize_roaming_notification
  Cleaned up the flag data_rat_metric_enabled
  Cleaned up the flag dsrs_diagnostics_enabled
  Cleaned up the flag reconnect_qualified_network
  Cleaned up the flag data_call_session_stats_captures_cross_sim_calling
  Cleaned up the flag vonr_enabled_metric
parents 0d7b3154 cc656f67

flags/data.aconfig

+0 −40
Original line number Diff line number Diff line
@@ -41,46 +41,6 @@ flag { 
  bug:"286171724"

}



# OWNER=qingqi TARGET=24Q3

flag {

  name: "vonr_enabled_metric"

  namespace: "telephony"

  description: "Collect vonr status in voice call metric"

  bug:"288449751"

}



# OWNER=apsankar TARGET=24Q3

flag {

  name: "data_call_session_stats_captures_cross_sim_calling"

  namespace: "telephony"

  description: "The DataCallSessionStats metrics will capture whether the IWLAN PDN is set up on cross-SIM calling."

  bug: "313956117"

}



# OWNER=sewook TARGET=24Q3

flag {

  name: "reconnect_qualified_network"

  namespace: "telephony"

  description: "This flag is for internal implementation to handle reconnect request from QNS in telephony FWK."

  bug: "319520561"

}



# OWNER=jackyu TARGET=24Q3

flag {

  name: "dsrs_diagnostics_enabled"

  namespace: "telephony"

  description: "Enable DSRS diagnostics."

  bug: "319601607"

}



# OWNER=jackyu TARGET=24Q3

flag {

  name: "data_rat_metric_enabled"

  namespace: "telephony"

  description: "Write DataRatStateChanged atom"

  bug:"318519337"

}



# OWNER=jackyu TARGET=24Q4

flag {

  name: "dds_callback"

flags/misc.aconfig

+0 −16
Original line number Diff line number Diff line
@@ -43,22 +43,6 @@ flag { 
  bug: "309655251"

}



# OWNER=sangyun TARGET=24Q2

flag {

  name: "reorganize_roaming_notification"

  namespace: "telephony"

  description: "Reorganize conditions to show and dismiss roaming notifications."

  bug: "310594087"

}



# OWNER=sangyun TARGET=24Q2

flag {

  name: "dismiss_network_selection_notification_on_sim_disable"

  namespace: "telephony"

  description: "Fix to dismiss network selection notification when disable sim."

  bug: "310594186"

}



# OWNER=nagendranb TARGET=24Q3

flag {

  name: "enable_telephony_analytics"

src/java/com/android/internal/telephony/data/AccessNetworksManager.java

+5 −7
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ public class AccessNetworksManager extends Handler { 


        @Override

        public void onReconnectQualifiedNetworkType(int apnTypes, int qualifiedNetworkType) {

            if (mFeatureFlags.reconnectQualifiedNetwork()) {

            log("onReconnectQualifiedNetworkType: apnTypes = ["

                    + ApnSetting.getApnTypesStringFromBitmask(apnTypes)

                    + "], networks = [" + AccessNetworkType.toString(qualifiedNetworkType)
@@ -355,7 +354,6 @@ public class AccessNetworksManager extends Handler { 
            handleQualifiedNetworksChanged(apnTypes, new int[]{qualifiedNetworkType}, true);

        }

    }

    }



    private void onEmergencyDataNetworkPreferredTransportChanged(

            @AccessNetworkConstants.TransportType int transportType) {

src/java/com/android/internal/telephony/data/DataStallRecoveryManager.java

+7 −13
Original line number Diff line number Diff line
@@ -571,16 +571,12 @@ public class DataStallRecoveryManager extends Handler { 
    private void onInternetValidationStatusChanged(@ValidationStatus int status) {

        logl("onInternetValidationStatusChanged: " + DataUtils.validationStatusToString(status));

        final boolean isValid = status == NetworkAgent.VALIDATION_STATUS_VALID;

        if (mFeatureFlags.dsrsDiagnosticsEnabled()) {

        mValidationCount += 1;

        mActionValidationCount += 1;

        }

        setNetworkValidationState(isValid);

        if (isValid) {

            if (mFeatureFlags.dsrsDiagnosticsEnabled()) {

            // Broadcast intent that data stall recovered.

            broadcastDataStallDetected(mLastAction);

            }

            reset();

        } else if (isRecoveryNeeded(true)) {

            // Set the network as invalid, because recovery is needed
@@ -620,7 +616,7 @@ public class DataStallRecoveryManager extends Handler { 
    @VisibleForTesting

    public void setRecoveryAction(@RecoveryAction int action) {

        // Reset the validation count for action change

        if (mFeatureFlags.dsrsDiagnosticsEnabled() && mRecoveryAction != action) {

        if (mRecoveryAction != action) {

            mActionValidationCount = 0;

        }

        mRecoveryAction = action;
@@ -702,10 +698,8 @@ public class DataStallRecoveryManager extends Handler { 
        final int duration = (int) (SystemClock.elapsedRealtime() - mDataStallStartMs);

        @RecoveredReason final int reason = getRecoveredReason(mIsValidNetwork);

        final int durationOfAction = (int) getDurationOfCurrentRecoveryMs();

        if (mFeatureFlags.dsrsDiagnosticsEnabled()) {

        log("mValidationCount=" + mValidationCount

                + ", mActionValidationCount=" + mActionValidationCount);

        }



        // Get the bundled DSRS stats.

        Bundle bundle = mStats.getDataStallRecoveryMetricsData(

src/java/com/android/internal/telephony/metrics/DataConnectionStateTracker.java

+1 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.telephony.metrics;



import static com.android.internal.telephony.flags.Flags.dataRatMetricEnabled;



import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.HandlerThread;
@@ -235,9 +233,7 @@ public class DataConnectionStateTracker { 


        @Override

        public void onActiveDataSubscriptionIdChanged(int subId) {

            if (dataRatMetricEnabled()) {

            logRATChanges(subId);

            }

            mActiveDataSubId = subId;

        }