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

Commit d03869d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug, AccessNetworkType.NGRAN was not mapping IRadio1.1 in Android R" into rvc-dev

parents 764c0320 ec316f6b

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

+9 −3
Original line number Original line Diff line number Diff line
@@ -2349,7 +2349,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    android.hardware.radio.V1_5.RadioAccessSpecifier rasInHalFormat =

                    android.hardware.radio.V1_5.RadioAccessSpecifier rasInHalFormat =

                            convertRadioAccessSpecifierToRadioHAL_1_5(ras);

                            convertRadioAccessSpecifierToRadioHAL_1_5(ras);

                    if (rasInHalFormat == null) {

                    if (rasInHalFormat == null) {

                        return;

                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                    }

                    }

                    request.specifiers.add(rasInHalFormat);

                    request.specifiers.add(rasInHalFormat);

                }

                }
@@ -2383,7 +2385,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    android.hardware.radio.V1_1.RadioAccessSpecifier rasInHalFormat =

                    android.hardware.radio.V1_1.RadioAccessSpecifier rasInHalFormat =

                            convertRadioAccessSpecifierToRadioHAL(ras);

                            convertRadioAccessSpecifierToRadioHAL(ras);

                    if (rasInHalFormat == null) {

                    if (rasInHalFormat == null) {

                        return;

                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                    }

                    }





                    request.specifiers.add(rasInHalFormat);

                    request.specifiers.add(rasInHalFormat);
@@ -2422,7 +2426,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    android.hardware.radio.V1_1.RadioAccessSpecifier rasInHalFormat =

                    android.hardware.radio.V1_1.RadioAccessSpecifier rasInHalFormat =

                            convertRadioAccessSpecifierToRadioHAL(ras);

                            convertRadioAccessSpecifierToRadioHAL(ras);

                    if (rasInHalFormat == null) {

                    if (rasInHalFormat == null) {

                        return;

                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                    }

                    }





                    request.specifiers.add(rasInHalFormat);

                    request.specifiers.add(rasInHalFormat);