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

Commit 87790c25 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove hidden annotation usage from NetworkStack 

NetworkStack uses hidden android.annotation.* annotations by pulling the
source files from frameworks/base. This should not be necessary, since
androidx annotations can be used instead.

Remove usage of such annotations and replace with androidx annotations.

Test: m NetworkStack NetworkStackApiStable
Test: builds, boots, WiFi working
Bug: 139105333
Change-Id: I24e147ac4f01feaf53424430b4825b316ec154fe
parent 5f48efe6

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ java_library { 
android_library {

    name: "NetworkStackApiStableLib",

    defaults: ["NetworkStackApiStableLevel"],

    srcs: [":framework-annotations", "src/**/*.java"],

    srcs: ["src/**/*.java"],

    // API stable uses a jarjared version of the shims

    static_libs: [

        "NetworkStackApiStableDependencies",

src/android/net/NetworkStackIpMemoryStore.java

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 


package android.net;



import android.annotation.NonNull;

import android.content.Context;



import androidx.annotation.NonNull;



import java.util.concurrent.ExecutionException;

import java.util.function.Consumer;

src/android/net/apf/ApfFilter.java

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERT 
import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION;

import static com.android.server.util.NetworkStackConstants.IPV6_ADDR_LEN;



import android.annotation.Nullable;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -59,6 +58,8 @@ import android.text.format.DateUtils; 
import android.util.Log;

import android.util.SparseArray;



import androidx.annotation.Nullable;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.HexDump;

src/android/net/dhcp/DhcpClient.java

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ import static android.system.OsConstants.SO_REUSEADDR; 


import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.net.DhcpResults;

import android.net.InetAddresses;
@@ -73,6 +71,9 @@ import android.util.EventLog; 
import android.util.Log;

import android.util.SparseArray;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.HexDump;

import com.android.internal.util.MessageUtils;

src/android/net/dhcp/DhcpLease.java

+3 −2
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 


package android.net.dhcp;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.net.MacAddress;

import android.os.SystemClock;

import android.text.TextUtils;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.util.HexDump;



import java.net.Inet4Address;