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

Commit 1d8bc06a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Removed duplicate error messages in RadioConfig.java"

parents 07a75898 72727ffd

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

+11 −3
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ public class RadioConfig extends Handler { 
     */

    public void setPreferredDataModem(int modemId, Message result) {

        RadioConfigProxy proxy = getRadioConfigProxy(null);

        if (proxy.isEmpty()) return;



        if (!isSetPreferredDataCommandSupported()) {

            if (result != null) {

                AsyncResult.forMessage(result, null,
@@ -481,7 +483,9 @@ public class RadioConfig extends Handler { 
     */

    public void getPhoneCapability(Message result) {

        RadioConfigProxy proxy = getRadioConfigProxy(null);

        if (proxy.isEmpty() || proxy.getVersion().less(RADIO_CONFIG_HAL_VERSION_1_1)) {

        if (proxy.isEmpty()) return;



        if (proxy.getVersion().less(RADIO_CONFIG_HAL_VERSION_1_1)) {

            if (result != null) {

                AsyncResult.forMessage(result, null,

                        CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
@@ -538,7 +542,9 @@ public class RadioConfig extends Handler { 
     */

    public void setNumOfLiveModems(int numOfLiveModems, Message result) {

        RadioConfigProxy proxy = getRadioConfigProxy(result);

        if (proxy.isEmpty() || proxy.getVersion().less(RADIO_CONFIG_HAL_VERSION_1_1)) {

        if (proxy.isEmpty()) return;



        if (proxy.getVersion().less(RADIO_CONFIG_HAL_VERSION_1_1)) {

            if (result != null) {

                AsyncResult.forMessage(

                        result, null, CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
@@ -582,7 +588,9 @@ public class RadioConfig extends Handler { 
     */

    public void getHalDeviceCapabilities(Message result) {

        RadioConfigProxy proxy = getRadioConfigProxy(Message.obtain(result));

        if (proxy.isEmpty() || proxy.getVersion().less(RADIO_CONFIG_HAL_VERSION_1_3)) {

        if (proxy.isEmpty()) return;



        if (proxy.getVersion().less(RADIO_CONFIG_HAL_VERSION_1_3)) {

            if (result != null) {

                if (DBG) {

                    logd("RIL_REQUEST_GET_HAL_DEVICE_CAPABILITIES > REQUEST_NOT_SUPPORTED");