Merge "Change method to show mobile radio power to getRadioPower" into main
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index 8dfb787..f6cd0d1 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -104,6 +104,8 @@
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.euicc.EuiccConnector;
+import com.android.internal.telephony.flags.FeatureFlags;
+import com.android.internal.telephony.flags.FeatureFlagsImpl;
import com.android.internal.telephony.util.TelephonyUtils;
import com.android.phone.R;
@@ -303,6 +305,8 @@
private int mCellInfoRefreshRateIndex;
private int mSelectedPhoneIndex;
+ private FeatureFlags mFeatureFlags;
+
private final NetworkRequest mDefaultNetworkRequest = new NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
@@ -508,6 +512,8 @@
log("Started onCreate");
+ mFeatureFlags = new FeatureFlagsImpl();
+
mQueuedWork = new ThreadPoolExecutor(1, 1, RUNNABLE_TIMEOUT_MS, TimeUnit.MICROSECONDS,
new LinkedBlockingDeque<Runnable>());
mConnectivityManager = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
@@ -1567,6 +1573,9 @@
};
private boolean isRadioOn() {
+ if (mFeatureFlags.radioInfoIsRadioOn()) {
+ return mTelephonyManager.getRadioPowerState() == TelephonyManager.RADIO_POWER_ON;
+ }
//FIXME: Replace with a TelephonyManager call
return mPhone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
}