Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548

Browse Source 
am: 33a9d34e8a

Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
This commit is contained in:
Jeremy Klein
2019-03-12 23:36:36 -07:00
committed by android-build-merger
parent 7499f3a1c4 33a9d34e8a
commit 9eeac7326d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -3124,7 +3124,7 @@ package android.net {
}
public static interface ConnectivityManager.OnTetheringEntitlementResultListener {
method public void onEntitlementResult(int);
method public void onTetheringEntitlementResult(int);
}
public abstract static class ConnectivityManager.OnTetheringEventCallback {

4
core/java/android/net/ConnectivityManager.java
View File

@@ -2805,7 +2805,7 @@ public class ConnectivityManager {
* {@link #TETHER_ERROR_PROVISION_FAILED}, or
* {@link #TETHER_ERROR_ENTITLEMENT_UNKONWN}.
*/
void onEntitlementResult(@EntitlementResultCode int resultCode);
void onTetheringEntitlementResult(@EntitlementResultCode int resultCode);
}
/**
@@ -2855,7 +2855,7 @@ public class ConnectivityManager {
protected void onReceiveResult(int resultCode, Bundle resultData) {
Binder.withCleanCallingIdentity(() ->
executor.execute(() -> {
listener.onEntitlementResult(resultCode);
listener.onTetheringEntitlementResult(resultCode);
}));
}
};