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

Commit a3e562cd authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Add Network security watchlist service"

parents 9c114081 1a6e667c

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/backup/IObbBackupService.aidl \

	core/java/com/android/internal/car/ICarServiceHelper.aidl \

	core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl \

	core/java/com/android/internal/net/INetworkWatchlistManager.aidl \

	core/java/com/android/internal/policy/IKeyguardDrawnCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardDismissCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \

core/java/android/app/SystemServiceRegistry.java

+13 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import android.net.INetworkPolicyManager; 
import android.net.IpSecManager;

import android.net.NetworkPolicyManager;

import android.net.NetworkScoreManager;

import android.net.NetworkWatchlistManager;

import android.net.lowpan.ILowpanManager;

import android.net.lowpan.LowpanManager;

import android.net.nsd.INsdManager;
@@ -150,6 +151,7 @@ import com.android.internal.app.IAppOpsService; 
import com.android.internal.app.IBatteryStats;

import com.android.internal.app.ISoundTriggerService;

import com.android.internal.appwidget.IAppWidgetService;

import com.android.internal.net.INetworkWatchlistManager;

import com.android.internal.os.IDropBoxManagerService;

import com.android.internal.policy.PhoneLayoutInflater;
@@ -862,6 +864,17 @@ final class SystemServiceRegistry { 
                return new ShortcutManager(ctx, IShortcutService.Stub.asInterface(b));

            }});



        registerService(Context.NETWORK_WATCHLIST_SERVICE, NetworkWatchlistManager.class,

                new CachedServiceFetcher<NetworkWatchlistManager>() {

                    @Override

                    public NetworkWatchlistManager createService(ContextImpl ctx)

                            throws ServiceNotFoundException {

                        IBinder b =

                                ServiceManager.getServiceOrThrow(Context.NETWORK_WATCHLIST_SERVICE);

                        return new NetworkWatchlistManager(ctx,

                                INetworkWatchlistManager.Stub.asInterface(b));

                    }});



        registerService(Context.SYSTEM_HEALTH_SERVICE, SystemHealthManager.class,

                new CachedServiceFetcher<SystemHealthManager>() {

            @Override

core/java/android/content/Context.java

+2 −0
Original line number Diff line number Diff line
@@ -3413,6 +3413,8 @@ public abstract class Context { 
    public static final String NETWORK_STATS_SERVICE = "netstats";

    /** {@hide} */

    public static final String NETWORK_POLICY_SERVICE = "netpolicy";

    /** {@hide} */

    public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist";



    /**

     * Use with {@link #getSystemService} to retrieve a {@link

core/java/android/net/IIpConnectivityMetrics.aidl

+3 −3
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ interface IIpConnectivityMetrics { 
    int logEvent(in ConnectivityMetricsEvent event);



    /**

     * At most one callback can be registered (by DevicePolicyManager).

     * Callback can be registered by DevicePolicyManager or NetworkWatchlistService only.

     * @return status {@code true} if registering/unregistering of the callback was successful,

     *         {@code false} otherwise (might happen if IIpConnectivityMetrics is not available,

     *         if it happens make sure you call it when the service is up in the caller)

     */

    boolean registerNetdEventCallback(in INetdEventCallback callback);

    boolean unregisterNetdEventCallback();

    boolean addNetdEventCallback(in int callerType, in INetdEventCallback callback);

    boolean removeNetdEventCallback(in int callerType);

}

core/java/android/net/INetdEventCallback.aidl

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ package android.net; 
/** {@hide} */

oneway interface INetdEventCallback {



    // Possible addNetdEventCallback callers.

    const int CALLBACK_CALLER_DEVICE_POLICY = 0;

    const int CALLBACK_CALLER_NETWORK_WATCHLIST = 1;



    /**

     * Reports a single DNS lookup function call.

     * This method must not block or perform long-running operations.