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

Commit 26de1d3b authored by Nathan Harold's avatar Nathan Harold
Browse files

Relocate KeepalivePacketData to frameworks/base 

Due to an issue resolving the boot classpath, the
KeepalivePacketData structure cannot be referenced
by frameworks/opt/telephony while it is in services.

-Move KeepalivePacketData to android.net
-Also, relocate IpUtils without changing the package
 name.

Bug: 38350389
Test: compilation
Merged-In: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
Change-Id: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
(cherry picked from commit 41002e30)
parent ac2247c4

services/core/java/com/android/server/connectivity/KeepalivePacketData.java→core/java/android/net/KeepalivePacketData.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.server.connectivity;

package android.net;





import static android.net.util.NetworkConstants.IPV4_HEADER_MIN_LEN;

import static android.net.util.NetworkConstants.IPV4_HEADER_MIN_LEN;

import static android.net.util.NetworkConstants.UDP_HEADER_LEN;

import static android.net.util.NetworkConstants.UDP_HEADER_LEN;

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.server.connectivity; 




import com.android.internal.util.HexDump;

import com.android.internal.util.HexDump;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.connectivity.KeepalivePacketData;

import com.android.server.connectivity.NetworkAgentInfo;

import com.android.server.connectivity.NetworkAgentInfo;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.PacketKeepalive;

import android.net.ConnectivityManager.PacketKeepalive;

import android.net.KeepalivePacketData;

import android.net.LinkAddress;

import android.net.LinkAddress;

import android.net.NetworkAgent;

import android.net.NetworkAgent;

import android.net.NetworkUtils;

import android.net.NetworkUtils;