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

Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 680cce79b9 am: 346cc58d29

Browse Source 
Change-Id: Iaa36b7036d916ef7a48314a3dfa224750e720c62
This commit is contained in:
Automerger Merge Worker
2020-01-24 16:50:29 +00:00
parent 1d7b1dddd4 346cc58d29
commit 7c0628505b
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/IConnectivityManager.aidl
View File

@@ -18,6 +18,7 @@ package android.net;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.net.ConnectionInfo; import android.net.ConnectionInfo;
import android.net.IConnectivityDiagnosticsCallback;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.NetworkAgentConfig; import android.net.NetworkAgentConfig;
@@ -211,5 +212,9 @@ interface IConnectivityManager
boolean isCallerCurrentAlwaysOnVpnApp(); boolean isCallerCurrentAlwaysOnVpnApp();
boolean isCallerCurrentAlwaysOnVpnLockdownApp(); boolean isCallerCurrentAlwaysOnVpnLockdownApp();
void registerConnectivityDiagnosticsCallback(in IConnectivityDiagnosticsCallback callback,
in NetworkRequest request);
void unregisterConnectivityDiagnosticsCallback(in IConnectivityDiagnosticsCallback callback);
IBinder startOrGetTestNetworkService(); IBinder startOrGetTestNetworkService();
} }

17
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -66,6 +66,7 @@ import android.net.CaptivePortal;
import android.net.ConnectionInfo; import android.net.ConnectionInfo;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ICaptivePortal; import android.net.ICaptivePortal;
import android.net.IConnectivityDiagnosticsCallback;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.IDnsResolver; import android.net.IDnsResolver;
import android.net.IIpConnectivityMetrics; import android.net.IIpConnectivityMetrics;
@@ -7307,4 +7308,20 @@ public class ConnectivityService extends IConnectivityManager.Stub
return mTNS; return mTNS;
} }
} }
@Override
public void registerConnectivityDiagnosticsCallback(
@NonNull IConnectivityDiagnosticsCallback callback, @NonNull NetworkRequest request) {
// TODO(b/146444622): implement register IConnectivityDiagnosticsCallback functionality
throw new UnsupportedOperationException(
"registerConnectivityDiagnosticsCallback not yet implemented");
}
@Override
public void unregisterConnectivityDiagnosticsCallback(
@NonNull IConnectivityDiagnosticsCallback callback) {
// TODO(b/146444622): implement register IConnectivityDiagnosticsCallback functionality
throw new UnsupportedOperationException(
"unregisterConnectivityDiagnosticsCallback not yet implemented");
}
} }