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

Commit bfe928d5 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Remove NetworkMonitor dependency on ICaptivePortal"

parents 60e7162e cfff01e2

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ java_defaults { 
        "core/java/android/hardware/radio/ITunerCallback.aidl",

        "core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl",

        "core/java/android/hardware/usb/IUsbManager.aidl",

        "core/java/android/net/ICaptivePortal.aidl",

        "core/java/android/net/IConnectivityManager.aidl",

        "core/java/android/net/IIpConnectivityMetrics.aidl",

        "core/java/android/net/IEthernetManager.aidl",
@@ -815,7 +816,6 @@ aidl_interface { 
    srcs: [

        "core/java/android/net/ApfCapabilitiesParcelable.aidl",

        "core/java/android/net/DhcpResultsParcelable.aidl",

        "core/java/android/net/ICaptivePortal.aidl",

        "core/java/android/net/INetworkMonitor.aidl",

        "core/java/android/net/INetworkMonitorCallbacks.aidl",

        "core/java/android/net/IIpMemoryStore.aidl",

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3101,7 +3101,7 @@ package android.net { 
    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementValue(int, boolean, @NonNull android.net.ConnectivityManager.TetheringEntitlementValueListener, @Nullable android.os.Handler);

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();

    method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void setAirplaneMode(boolean);

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.os.Bundle);

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.net.Network, android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);

    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);

    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void stopTethering(int);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ package android.net { 
  }



  public class ConnectivityManager {

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.os.Bundle);

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.net.Network, android.os.Bundle);

    field public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";

    field public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT";

  }

core/java/android/net/ConnectivityManager.java

+3 −2
Original line number Diff line number Diff line
@@ -3920,15 +3920,16 @@ public class ConnectivityManager { 
     *

     * <p>This endpoint is exclusively for use by the NetworkStack and is protected by the

     * corresponding permission.

     * @param network Network on which the captive portal was detected.

     * @param appExtras Extras to include in the app start intent.

     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)

    public void startCaptivePortalApp(Bundle appExtras) {

    public void startCaptivePortalApp(Network network, Bundle appExtras) {

        try {

            mService.startCaptivePortalAppInternal(appExtras);

            mService.startCaptivePortalAppInternal(network, appExtras);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/net/IConnectivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ interface IConnectivityManager 
    void setAcceptUnvalidated(in Network network, boolean accept, boolean always);

    void setAvoidUnvalidated(in Network network);

    void startCaptivePortalApp(in Network network);

    void startCaptivePortalAppInternal(in Bundle appExtras);

    void startCaptivePortalAppInternal(in Network network, in Bundle appExtras);



    boolean getAvoidBadWifi();

    int getMultipathPreference(in Network Network);