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

Commit fd63d09a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bug, AccessNetworkType.NGRAN was not mapping IRadio1.1 in Android... 

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

Change-Id: I58ad8d331a722c6779d93e21b229e50c620f60a9
parents 82a98d39 d03869d0

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

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

                            convertRadioAccessSpecifierToRadioHAL_1_5(ras);

                    if (rasInHalFormat == null) {

                        return;

                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                    }

                    request.specifiers.add(rasInHalFormat);

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

                            convertRadioAccessSpecifierToRadioHAL(ras);

                    if (rasInHalFormat == null) {

                        return;

                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                    }



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

                            convertRadioAccessSpecifierToRadioHAL(ras);

                    if (rasInHalFormat == null) {

                        return;

                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                    }



                    request.specifiers.add(rasInHalFormat);