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

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

Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()"

parents e0bba99c 44dcbde5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26167,6 +26167,7 @@ package android.net { 
    method public deprecated android.net.NetworkInfo getNetworkInfo(int);

    method public android.net.NetworkInfo getNetworkInfo(android.net.Network);

    method public deprecated int getNetworkPreference();

    method public byte[] getNetworkWatchlistConfigHash();

    method public static deprecated android.net.Network getProcessDefaultNetwork();

    method public int getRestrictBackgroundStatus();

    method public boolean isActiveNetworkMetered();

core/java/android/net/ConnectivityManager.java

+16 −0
Original line number Diff line number Diff line
@@ -3763,4 +3763,20 @@ public class ConnectivityManager { 
            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * The network watchlist is a list of domains and IP addresses that are associated with

     * potentially harmful apps. This method returns the hash of the watchlist currently

     * used by the system.

     *

     * @return Hash of network watchlist config file. Null if config does not exist.

     */

    public byte[] getNetworkWatchlistConfigHash() {

        try {

            return mService.getNetworkWatchlistConfigHash();

        } catch (RemoteException e) {

            Log.e(TAG, "Unable to get watchlist config hash");

            throw e.rethrowFromSystemServer();

        }

    }

}

core/java/android/net/IConnectivityManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -180,4 +180,6 @@ interface IConnectivityManager 
    void stopKeepalive(in Network network, int slot);



    String getCaptivePortalServerUrl();



    byte[] getNetworkWatchlistConfigHash();

}

core/java/android/net/NetworkWatchlistManager.java

+12 −0
Original line number Diff line number Diff line
@@ -86,4 +86,16 @@ public class NetworkWatchlistManager { 
            e.rethrowFromSystemServer();

        }

    }



    /**

     * Get Network Watchlist config file hash.

     */

    public byte[] getWatchlistConfigHash() {

        try {

            return mNetworkWatchlistManager.getWatchlistConfigHash();

        } catch (RemoteException e) {

            Log.e(TAG, "Unable to get watchlist config hash");

            throw e.rethrowFromSystemServer();

        }

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -24,4 +24,5 @@ interface INetworkWatchlistManager { 
    boolean stopWatchlistLogging();

    void reloadWatchlist();

    void reportWatchlistIfNecessary();

    byte[] getWatchlistConfigHash();

}