[Telephony Debug Menu] Remove NeighboringCellInfo
This CL removes the long-obsolete NeighboringCellInfo.
From a debug perspective, this info is a subset of the
other info already present, so it just adds clutter
without adding any value.
Bug: 78791811
Test: manual
Change-Id: Iaf275f81e276f63bdd9651ac60a5485bf5bdf160
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 0ec1f10..2d4a1d0 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -321,13 +321,6 @@
<TextView android:id="@+id/location" style="@style/info_value" />
</LinearLayout>
- <!-- Neighboring Cids -->
- <LinearLayout style="@style/entry_layout">
- <TextView android:text="@string/radio_info_neighboring_location_label"
- style="@style/info_label" />
- <TextView android:id="@+id/neighboring" style="@style/info_value" />
- </LinearLayout>
-
<!-- CellInfo -->
<LinearLayout style="@style/entry_layout">
<TextView android:text="@string/radio_info_cellinfo_label"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29330dd..13d8895 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -453,8 +453,6 @@
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_signal_location_label">Cell Location Info (deprecated):</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radio_info_neighboring_location_label">Neighbor Cell Info (deprecated):</string>
- <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_phy_chan_config">LTE Physical Channel Configuration:</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_cell_info_refresh_rate">Cell Info Refresh Rate:</string>
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 170db16..3063ecc 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -55,7 +55,6 @@
import android.telephony.CellSignalStrengthLte;
import android.telephony.CellSignalStrengthWcdma;
import android.telephony.DataConnectionRealTimeInfo;
-import android.telephony.NeighboringCellInfo;
import android.telephony.PreciseCallState;
import android.telephony.PhoneStateListener;
import android.telephony.PhysicalChannelConfig;
@@ -193,7 +192,6 @@
private TextView mMwi;
private TextView mCfi;
private TextView mLocation;
- private TextView mNeighboringCids;
private TextView mCellInfo;
private TextView mDcRtInfoTv;
private TextView sent;
@@ -235,7 +233,6 @@
private List<CellInfo> mCellInfoResult = null;
private CellLocation mCellLocationResult = null;
- private List<NeighboringCellInfo> mNeighboringCellResult = null;
private int mPreferredNetworkTypeResult;
private int mCellInfoRefreshRateIndex;
@@ -433,7 +430,6 @@
mMwi = (TextView) findViewById(R.id.mwi);
mCfi = (TextView) findViewById(R.id.cfi);
mLocation = (TextView) findViewById(R.id.location);
- mNeighboringCids = (TextView) findViewById(R.id.neighboring);
mCellInfo = (TextView) findViewById(R.id.cellinfo);
mCellInfo.setTypeface(Typeface.MONOSPACE);
mDcRtInfoTv = (TextView) findViewById(R.id.dcrtinfo);
@@ -520,7 +516,6 @@
updateDnsCheckState();
updateNetworkType();
- updateNeighboringCids(mNeighboringCellResult);
updateLocation(mCellLocationResult);
updateCellInfo(mCellInfoResult);
@@ -714,23 +709,6 @@
}
- private final void updateNeighboringCids(List<NeighboringCellInfo> cids) {
- StringBuilder sb = new StringBuilder();
-
- if (cids != null) {
- if (cids.isEmpty()) {
- sb.append("no neighboring cells");
- } else {
- for (NeighboringCellInfo cell : cids) {
- sb.append(cell.toString()).append(" ");
- }
- }
- } else {
- sb.append("unknown");
- }
- mNeighboringCids.setText(sb.toString());
- }
-
private final String getCellInfoDisplayString(int i) {
return (i != Integer.MAX_VALUE) ? Integer.toString(i) : "";
}
@@ -1079,12 +1057,10 @@
private final void updateAllCellInfo() {
mCellInfo.setText("");
- mNeighboringCids.setText("");
mLocation.setText("");
final Runnable updateAllCellInfoResults = new Runnable() {
public void run() {
- updateNeighboringCids(mNeighboringCellResult);
updateLocation(mCellLocationResult);
updateCellInfo(mCellInfoResult);
}
@@ -1095,7 +1071,6 @@
public void run() {
mCellInfoResult = mTelephonyManager.getAllCellInfo();
mCellLocationResult = mTelephonyManager.getCellLocation();
- mNeighboringCellResult = mTelephonyManager.getNeighboringCellInfo();
mHandler.post(updateAllCellInfoResults);
}