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

Commit a8f471c0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Add SystemApi for captive portal metrics"

parents 9778ed5c d4a9de20

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4095,6 +4095,7 @@ package android.net { 














  public class CaptivePortal implements android.os.Parcelable {















    ctor public CaptivePortal(android.os.IBinder);













    method public void logEvent(int, String);















    method public void useNetwork();















    field public static final int APP_RETURN_DISMISSED = 0; // 0x0















    field public static final int APP_RETURN_UNWANTED = 1; // 0x1

































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -804,6 +804,7 @@ package android.net {





























  public class CaptivePortal implements android.os.Parcelable {















    ctor public CaptivePortal(android.os.IBinder);













    method public void logEvent(int, String);















    method public void useNetwork();















    field public static final int APP_RETURN_DISMISSED = 0; // 0x0















    field public static final int APP_RETURN_UNWANTED = 1; // 0x1

































core/java/android/net/CaptivePortal.java



+13
−0




























Original line number
Diff line number
Diff line








@@ -117,4 +117,17 @@ public class CaptivePortal implements Parcelable {













        } catch (RemoteException e) {















        }















    }



























    /**













     * Log a captive portal login event.













     * @hide













     */













    @SystemApi













    @TestApi













    public void logEvent(int eventId, String packageName) {













        try {













            ICaptivePortal.Stub.asInterface(mBinder).logEvent(eventId, packageName);













        } catch (RemoteException e) {













        }













    }















}
























core/java/android/net/ICaptivePortal.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -22,4 +22,5 @@ package android.net;













 */















oneway interface ICaptivePortal {















    void appResponse(int response);













    void logEvent(int eventId, String packageName);















}
























core/java/android/net/INetworkMonitorCallbacks.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -26,4 +26,5 @@ oneway interface INetworkMonitorCallbacks {













    void notifyPrivateDnsConfigResolved(in PrivateDnsConfigParcel config);















    void showProvisioningNotification(String action);















    void hideProvisioningNotification();













    void logCaptivePortalLoginEvent(int eventId, String packageName);















}










 No newline at end of file