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

Commit e636dc97 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am:... 

Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 5b8737d5 am: fc04c384 am: b52e9ce8

Change-Id: Iec4dcf4c39edb8994ed72b9550845ea5962e836a
parents 1b97821f b52e9ce8

core/java/android/net/IConnectivityManager.aidl

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

}
 
}

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

+17 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,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;
@@ -7314,4 +7315,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");

    }

}
 
}