From 8ce655ce240d8566f2d8b25f28097eed00ccd387 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Tue, 5 Sep 2023 16:36:39 +0800 Subject: [PATCH] telephony: add support for unknown radio hal version Signed-off-by: hmz007 --- .../com/android/internal/telephony/RadioConfig.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/frameworks/opt/telephony/src/java/com/android/internal/telephony/RadioConfig.java b/frameworks/opt/telephony/src/java/com/android/internal/telephony/RadioConfig.java index 3e2be1d6ae3..963caac5e40 100644 --- a/frameworks/opt/telephony/src/java/com/android/internal/telephony/RadioConfig.java +++ b/frameworks/opt/telephony/src/java/com/android/internal/telephony/RadioConfig.java @@ -36,6 +36,7 @@ import android.os.Message; import android.os.Registrant; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.SystemProperties; import android.os.Trace; import android.os.WorkSource; import android.telephony.TelephonyManager; @@ -86,7 +87,16 @@ public class RadioConfig extends Handler { } private RadioConfig(Context context, HalVersion radioHalVersion) { - mIsMobileNetworkSupported = isMobileDataCapable(context); + if (radioHalVersion.equals(RIL.RADIO_HAL_VERSION_UNKNOWN)) { + logd("Radio Hal Version is UNKNOWN!"); + mIsMobileNetworkSupported = false; + } else if (SystemProperties.getBoolean("ro.radio.noril", false)) { + logd("RIL: cellular disabled on ro.radio.noril"); + mIsMobileNetworkSupported = false; + } else { + mIsMobileNetworkSupported = isMobileDataCapable(context); + } + mRadioConfigProxy = new RadioConfigProxy(this, radioHalVersion); mDefaultWorkSource = new WorkSource(context.getApplicationInfo().uid, context.getPackageName());