LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relocate KeepalivePacketData to frameworks/base

Browse Source 
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 f8a2bc3eee)
This commit is contained in:
Nathan Harold
2017-11-02 21:01:46 -07:00
parent f597b81b4e
commit 583c95be3b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

2
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
View File

@@ -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;