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

Commit f6d56ee8 authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
Browse files

Merge "Update NattKeepalive Error Codes to Match SocketKeepalive" am: 98d23b2a 

am: ec41f92f

Change-Id: I9810a2d35b40c05f8fa36214ccc2bcbd878e1821
parents 2485b369 ec41f92f

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;