commit 0ef72a9416dca8480fac47b67003cbd771bae1b3
author Nathan Harold <nharold@google.com> Tue Apr 17 17:13:30 2018 -0700
committer Nathan Harold <nharold@google.com> Thu May 17 11:46:23 2018 -0700
tree 7af67dff5aabf50a95ec807dfd04c257feb7451b
parent 326a5dd6b27335dcb5b637961af074c349f45deb

[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

diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 2d4a1d0..177c73a 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" />

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13d8895..93b93e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -459,8 +459,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>

src/com/android/settings/RadioInfo.java

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 3063ecc..c04269c 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -54,7 +54,6 @@
 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 @@
     private TextView mCfi;
     private TextView mLocation;
     private TextView mCellInfo;
-    private TextView mDcRtInfoTv;
     private TextView sent;
     private TextView received;
     private TextView mPingHostnameV4;
@@ -298,12 +296,6 @@
         }
 
         @Override
-        public void onDataConnectionRealTimeInfoChanged(DataConnectionRealTimeInfo dcRtInfo) {
-            log("onDataConnectionRealTimeInfoChanged: dcRtInfo=" + dcRtInfo);
-            updateDcRtInfoTv(dcRtInfo);
-        }
-
-        @Override
         public void onSignalStrengthsChanged(SignalStrength signalStrength) {
             log("onSignalStrengthChanged: SignalStrength=" +signalStrength);
             updateSignalStrength(signalStrength);
@@ -432,7 +424,6 @@
         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 @@
         mCellInfo.setText(buildCellInfoString(arrayCi));
     }
 
-    private final void updateDcRtInfoTv(DataConnectionRealTimeInfo dcRtInfo) {
-        mDcRtInfoTv.setText(dcRtInfo.toString());
-    }
-
     private final void
     updateMessageWaiting() {
         mMwi.setText(String.valueOf(mMwiValue));