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

Commit 5b8737d5 authored by Cody Kesting's avatar Cody Kesting Committed by Gerrit Code Review
Browse files

Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks."

parents 7975dd57 5aadb8b1

core/java/android/net/IConnectivityManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -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();

}

services/core/java/com/android/server/ConnectivityService.java

+17 −0
Original line number Diff line number Diff line
@@ -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");

    }

}