From 3d41affd2c97a753e18e474eaea26a83554829d4 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Tue, 17 Apr 2018 17:13:30 -0700
Subject: [PATCH] [Telephony Debug Menu] Remove DcRtInfo

Remove the obsolete and unsupported DcRtInfo
field from the Debug menu. Since it doesn't
do anything and hasn't for a few releases,
we should make space for things that are
supported and minimize clutter.

Bug: 78791811
Test: manual
Change-Id: Id4cc808bf5c7671408cd5297965d93140aeefe97
---
 res/layout/radio_info.xml               |  7 -------
 res/values/strings.xml                  |  2 --
 src/com/android/settings/RadioInfo.java | 13 -------------
 3 files changed, 22 deletions(-)

diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 2d4a1d0e6c9..177c73a8a94 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -164,13 +164,6 @@
             android:layout_height="1dip"
             android:background="#000000" />
 
-        <!-- DcRtInfo - DataConnectionRealTimeInfo -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_dcrtinfo_label"
-                      style="@style/info_label" />
-            <TextView android:id="@+id/dcrtinfo" style="@style/info_value" />
-        </LinearLayout>
-
         <!-- Message Waiting Indicator -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_message_waiting_label" style="@style/info_label" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 24fd13131e4..f7824fe682e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -484,8 +484,6 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_cellinfo_label">All Cell Measurement Info:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_dcrtinfo_label">Data Connection Real-Time Info:</string>
-    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_gprs_service_label">Data Service:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_roaming_label">Roaming:</string>
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 3063ecc0d3d..c04269c1696 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -54,7 +54,6 @@ import android.telephony.CellSignalStrengthCdma;
 import android.telephony.CellSignalStrengthGsm;
 import android.telephony.CellSignalStrengthLte;
 import android.telephony.CellSignalStrengthWcdma;
-import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.PreciseCallState;
 import android.telephony.PhoneStateListener;
 import android.telephony.PhysicalChannelConfig;
@@ -193,7 +192,6 @@ public class RadioInfo extends Activity {
     private TextView mCfi;
     private TextView mLocation;
     private TextView mCellInfo;
-    private TextView mDcRtInfoTv;
     private TextView sent;
     private TextView received;
     private TextView mPingHostnameV4;
@@ -297,12 +295,6 @@ public class RadioInfo extends Activity {
             updateCellInfo(mCellInfoResult);
         }
 
-        @Override
-        public void onDataConnectionRealTimeInfoChanged(DataConnectionRealTimeInfo dcRtInfo) {
-            log("onDataConnectionRealTimeInfoChanged: dcRtInfo=" + dcRtInfo);
-            updateDcRtInfoTv(dcRtInfo);
-        }
-
         @Override
         public void onSignalStrengthsChanged(SignalStrength signalStrength) {
             log("onSignalStrengthChanged: SignalStrength=" +signalStrength);
@@ -432,7 +424,6 @@ public class RadioInfo extends Activity {
         mLocation = (TextView) findViewById(R.id.location);
         mCellInfo = (TextView) findViewById(R.id.cellinfo);
         mCellInfo.setTypeface(Typeface.MONOSPACE);
-        mDcRtInfoTv = (TextView) findViewById(R.id.dcrtinfo);
 
         sent = (TextView) findViewById(R.id.sent);
         received = (TextView) findViewById(R.id.received);
@@ -861,10 +852,6 @@ public class RadioInfo extends Activity {
         mCellInfo.setText(buildCellInfoString(arrayCi));
     }
 
-    private final void updateDcRtInfoTv(DataConnectionRealTimeInfo dcRtInfo) {
-        mDcRtInfoTv.setText(dcRtInfo.toString());
-    }
-
     private final void
     updateMessageWaiting() {
         mMwi.setText(String.valueOf(mMwiValue));