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

Merge "[CS05]Remove the hidden API usage of MetricsLogger"

Browse Source
This commit is contained in:
Frank Li
2021-03-04 01:34:53 +00:00
committed by Gerrit Code Review
parent 48172e9b5d 1c7789742b
commit 4297526f8b
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 { package android.net {
public class CaptivePortal implements android.os.Parcelable { 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 @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork();
method public void useNetwork(); method public void useNetwork();
field public static final int APP_REQUEST_REEVALUATION_REQUIRED = 100; // 0x64 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 eventId one of the CAPTIVE_PORTAL_LOGIN_* constants in metrics_constants.proto.
* @param packageName captive portal application package name. * @param packageName captive portal application package name.
* @hide * @hide
* @deprecated The event will not be logged in Android S and above. The
* caller is migrating to statsd.
*/ */
@Deprecated
@SystemApi @SystemApi
public void logEvent(int eventId, @NonNull String packageName) { 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 { oneway interface ICaptivePortal {
void appRequest(int request); void appRequest(int request);
void appResponse(int response); void appResponse(int response);
void logEvent(int eventId, String packageName);
} }