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

Commit 30b0d43b authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move connectivity AIDLs to android.net" into sc-dev am: 6c9f7d99 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13925160

Change-Id: Id58a461a76740ad33f2acba939640cefbf9387a5
parents 868d3ece 6c9f7d99

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import android.util.Log; 
import android.util.Range;

import android.util.SparseIntArray;



import com.android.connectivity.aidl.INetworkAgent;

import com.android.internal.annotations.GuardedBy;



import libcore.net.event.NetworkEventDispatcher;

packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl

+1 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.PendingIntent; 
import android.net.ConnectionInfo;

import android.net.ConnectivityDiagnosticsManager;

import android.net.IConnectivityDiagnosticsCallback;

import android.net.INetworkAgent;

import android.net.IOnCompleteListener;

import android.net.INetworkActivityListener;

import android.net.IQosCallback;
@@ -45,8 +46,6 @@ import android.os.PersistableBundle; 
import android.os.ResultReceiver;

import android.os.UserHandle;



import com.android.connectivity.aidl.INetworkAgent;



/**

 * Interface that answers queries about, and allows changing, the

 * state of network connectivity.

packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgent.aidl→packages/Connectivity/framework/src/android/net/INetworkAgent.aidl

+2 −2
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 
 * See the License for the specific language governing perNmissions and

 * limitations under the License.

 */

package com.android.connectivity.aidl;

package android.net;



import android.net.NattKeepalivePacketData;

import android.net.QosFilterParcelable;

import android.net.TcpKeepalivePacketData;



import com.android.connectivity.aidl.INetworkAgentRegistry;

import android.net.INetworkAgentRegistry;



/**

 * Interface to notify NetworkAgent of connectivity events.

packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgentRegistry.aidl→packages/Connectivity/framework/src/android/net/INetworkAgentRegistry.aidl

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing perNmissions and

 * limitations under the License.

 */

package com.android.connectivity.aidl;

package android.net;



import android.net.LinkProperties;

import android.net.Network;

packages/Connectivity/framework/src/android/net/NetworkAgent.java

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import android.os.RemoteException; 
import android.telephony.data.EpsBearerQosSessionAttributes;

import android.util.Log;



import com.android.connectivity.aidl.INetworkAgent;

import com.android.connectivity.aidl.INetworkAgentRegistry;

import com.android.internal.annotations.VisibleForTesting;



import java.lang.annotation.Retention;