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

Commit 5e5cd117 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove CaptivePortal deps on @hide MetricEvents" am: e8f300c3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513141

Change-Id: I647b1cc3329c527d9afa507864700a521a0908be
parents 41e94b11 e8f300c3

core/java/android/net/CaptivePortal.java

+1 −15
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package android.net;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;
@@ -24,8 +23,6 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.RemoteException;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;



/**

 * A class allowing apps handling the {@link ConnectivityManager#ACTION_CAPTIVE_PORTAL_SIGN_IN}

 * activity to indicate to the system different outcomes of captive portal sign in.  This class is
@@ -74,17 +71,6 @@ public class CaptivePortal implements Parcelable { 


    private final IBinder mBinder;



    /** @hide */

    @IntDef(value = {

        MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_ACTIVITY,

        MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_RESULT_DISMISSED,

        MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_RESULT_UNWANTED,

        MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_RESULT_WANTED_AS_IS,

        MetricsEvent.CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR,

    })

    public @interface EventId {

    }



    /** @hide */

    public CaptivePortal(@NonNull IBinder binder) {

        mBinder = binder;
@@ -176,7 +162,7 @@ public class CaptivePortal implements Parcelable { 
     * @hide

     */

    @SystemApi

    public void logEvent(@EventId int eventId, @NonNull String packageName) {

    public void logEvent(int eventId, @NonNull String packageName) {

        try {

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

        } catch (RemoteException e) {