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

Commit b103c321 authored by junyulai's avatar junyulai Committed by Junyu Lai
Browse files

Update NattKeepalive Error Codes to Match SocketKeepalive 

Bug: 126700278
Test: 1. m -j
      2. m -j doc-comment-check-docs
      3. atest FrameworksNetTests
      4. atest FrameworksTelephonyTests

Change-Id: Id3983553c866d76c4e574a14fdbcae9e95c366ae
parent bf673d01

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+3 −2
Original line number Diff line number Diff line
@@ -2445,7 +2445,7 @@ public class DataConnection extends StateMachine { 
                DataConnection.this.obtainMessage(EVENT_KEEPALIVE_START_REQUEST,

                        msg.arg1, msg.arg2, msg.obj).sendToTarget();

            } else {

                onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED);

                onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_UNSUPPORTED);

            }

        }
@@ -2481,8 +2481,9 @@ public class DataConnection extends StateMachine { 
                    case KeepaliveStatus.ERROR_NONE:

                        return SocketKeepalive.SUCCESS;

                    case KeepaliveStatus.ERROR_UNSUPPORTED:

                        return SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED;

                        return SocketKeepalive.ERROR_UNSUPPORTED;

                    case KeepaliveStatus.ERROR_NO_RESOURCES:

                        return SocketKeepalive.ERROR_INSUFFICIENT_RESOURCES;

                    case KeepaliveStatus.ERROR_UNKNOWN:

                    default:

                        return SocketKeepalive.ERROR_HARDWARE_ERROR;