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

Commit ce1a9d8f authored by Chalard Jean's avatar Chalard Jean
Browse files

Pre-import to remove a conflict. 

Test: compiles and passes checkstyle
Change-Id: I1ffdd88e6268fee0cf88992420ab21eb42928957
parent bf996dd4

core/java/android/net/NetworkAgent.java

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net;



import android.content.Context;

import android.net.ConnectivityManager.PacketKeepalive;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;
@@ -26,7 +27,6 @@ import android.util.Log; 


import com.android.internal.util.AsyncChannel;

import com.android.internal.util.Protocol;

import android.net.ConnectivityManager.PacketKeepalive;



import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicBoolean;

core/java/android/net/NetworkCapabilities.java

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.IntDef; 
import android.net.ConnectivityManager.NetworkCallback;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.proto.ProtoOutputStream;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.BitUtils;