joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 4297526f8b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8de53ff3755ae4f15bdaf1b4f6dbd1850e99ed94
This commit is contained in:
Frank Li 2021-03-04 02:52:52 +00:00 • committed by Automerger Merge Worker
commit 7f3280692c
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
framework/api/system-current.txt
View file

@ -2,7 +2,7 @@
package android.net {
public class CaptivePortal implements android.os.Parcelable {
method public void logEvent(int, @NonNull String);
method @Deprecated public void logEvent(int, @NonNull String);
method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork();
method public void useNetwork();
field public static final int APP_REQUEST_REEVALUATION_REQUIRED = 100; // 0x64

7
framework/src/android/net/CaptivePortal.java
View file

@ -160,12 +160,11 @@ public class CaptivePortal implements Parcelable {
* @param eventId one of the CAPTIVE_PORTAL_LOGIN_* constants in metrics_constants.proto.
* @param packageName captive portal application package name.
* @hide
* @deprecated The event will not be logged in Android S and above. The
* caller is migrating to statsd.
*/
@Deprecated
@SystemApi
public void logEvent(int eventId, @NonNull String packageName) {
try {
ICaptivePortal.Stub.asInterface(mBinder).logEvent(eventId, packageName);
} catch (RemoteException e) {
}
}
}

1
framework/src/android/net/ICaptivePortal.aidl
View file

@ -23,5 +23,4 @@ package android.net;
oneway interface ICaptivePortal {
void appRequest(int request);
void appResponse(int response);
void logEvent(int eventId, String packageName);
}