Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks."

This commit is contained in:
Cody Kesting
2020-01-24 16:38:22 +00:00
committed by Gerrit Code Review
2 changed files with 22 additions and 0 deletions

View File

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

View File

@@ -66,6 +66,7 @@ import android.net.CaptivePortal;
import android.net.ConnectionInfo;
import android.net.ConnectivityManager;
import android.net.ICaptivePortal;
import android.net.IConnectivityDiagnosticsCallback;
import android.net.IConnectivityManager;
import android.net.IDnsResolver;
import android.net.IIpConnectivityMetrics;
@@ -7307,4 +7308,20 @@ public class ConnectivityService extends IConnectivityManager.Stub
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");
}
}