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

Move connectivity AIDLs to android.net am: 43dea2835e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596272

Change-Id: If61c15ea55ec2081eab7fd2368e77f16ef51c769
This commit is contained in:
Remi NGUYEN VAN
2021-03-21 16:41:38 +00:00
committed by Automerger Merge Worker
parent a5e5949870 43dea2835e
commit 5814872f7e
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/android/net/ConnectivityManager.java
View File

@@ -73,7 +73,6 @@ import android.util.Log;
import android.util.Range; import android.util.Range;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import com.android.connectivity.aidl.INetworkAgent;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;

3
framework/src/android/net/IConnectivityManager.aidl
View File

@@ -20,6 +20,7 @@ import android.app.PendingIntent;
import android.net.ConnectionInfo; import android.net.ConnectionInfo;
import android.net.ConnectivityDiagnosticsManager; import android.net.ConnectivityDiagnosticsManager;
import android.net.IConnectivityDiagnosticsCallback; import android.net.IConnectivityDiagnosticsCallback;
import android.net.INetworkAgent;
import android.net.IOnCompleteListener; import android.net.IOnCompleteListener;
import android.net.INetworkActivityListener; import android.net.INetworkActivityListener;
import android.net.IQosCallback; import android.net.IQosCallback;
@@ -45,8 +46,6 @@ import android.os.PersistableBundle;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.os.UserHandle; import android.os.UserHandle;
import com.android.connectivity.aidl.INetworkAgent;
/** /**
* Interface that answers queries about, and allows changing, the * Interface that answers queries about, and allows changing, the
* state of network connectivity. * state of network connectivity.

4
framework/src/com/android/connectivity/aidl/INetworkAgent.aidl → framework/src/android/net/INetworkAgent.aidl
View File

@@ -13,13 +13,13 @@
* See the License for the specific language governing perNmissions and * See the License for the specific language governing perNmissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.connectivity.aidl; package android.net;
import android.net.NattKeepalivePacketData; import android.net.NattKeepalivePacketData;
import android.net.QosFilterParcelable; import android.net.QosFilterParcelable;
import android.net.TcpKeepalivePacketData; import android.net.TcpKeepalivePacketData;
import com.android.connectivity.aidl.INetworkAgentRegistry; import android.net.INetworkAgentRegistry;
/** /**
* Interface to notify NetworkAgent of connectivity events. * Interface to notify NetworkAgent of connectivity events.

2
framework/src/com/android/connectivity/aidl/INetworkAgentRegistry.aidl → framework/src/android/net/INetworkAgentRegistry.aidl
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing perNmissions and * See the License for the specific language governing perNmissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.connectivity.aidl; package android.net;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.Network; import android.net.Network;

2
framework/src/android/net/NetworkAgent.java
View File

@@ -34,8 +34,6 @@ import android.os.RemoteException;
import android.telephony.data.EpsBearerQosSessionAttributes; import android.telephony.data.EpsBearerQosSessionAttributes;
import android.util.Log; import android.util.Log;
import com.android.connectivity.aidl.INetworkAgent;
import com.android.connectivity.aidl.INetworkAgentRegistry;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;