Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a397062 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Revert^2 "Fix getHalVersion overriding UNSUPPORTED version" 

This reverts commit 6d1e2b8b.

Reason for revert: partial reland

Bug: 353979854
Bug: 364850618
Test: atest CtsTelephonyTestCases
Change-Id: Iffa20ab98fdea56465371b74ad0db07dcec28337
parent e3403f07

src/java/com/android/internal/telephony/RIL.java

+10 −4
Original line number Diff line number Diff line
@@ -1047,10 +1047,16 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    }

                } else {

                    mDisabledRadioServices.get(service).add(mPhoneId);

                    if (isRadioServiceSupported(service)) {

                        mHalVersion.put(service, RADIO_HAL_VERSION_UNKNOWN);

                        riljLoge("getRadioServiceProxy: set " + serviceToString(service) + " for "

                                + HIDL_SERVICE_NAME[mPhoneId] + " as disabled\n"

                                + android.util.Log.getStackTraceString(new RuntimeException()));

                    } else {

                        mHalVersion.put(service, RADIO_HAL_VERSION_UNSUPPORTED);

                        riljLog("getRadioServiceProxy: set " + serviceToString(service) + " for "

                                + HIDL_SERVICE_NAME[mPhoneId] + " as disabled (unsupported)");

                    }

                }

            }

        } catch (RemoteException e) {