LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add SystemApi for captive portal metrics"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-01-30 22:24:12 +00:00
committed by Gerrit Code Review
parent 4ed5cbd750 fb43a914d3
commit b591097458
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/net/CaptivePortal.java
View File

@@ -117,4 +117,17 @@ public class CaptivePortal implements Parcelable {
} catch (RemoteException e) { } 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) {
}
}
} }

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -145,6 +145,7 @@ import com.android.internal.R;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats; import com.android.internal.app.IBatteryStats;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo; import com.android.internal.net.VpnInfo;
@@ -2684,6 +2685,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE, EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE,
mNai.network.netId)); mNai.network.netId));
} }
@Override
public void logCaptivePortalLoginEvent(int eventId, String packageName) {
new MetricsLogger().action(eventId, packageName);
}
} }
private boolean networkRequiresValidation(NetworkAgentInfo nai) { private boolean networkRequiresValidation(NetworkAgentInfo nai) {