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."

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-13 04:48:24 +00:00
committed by Gerrit Code Review
parent 58385e9796 9f2e0f035a
commit 0102e3d548
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 { public static interface ConnectivityManager.OnTetheringEntitlementResultListener {
method public void onEntitlementResult(int); method public void onTetheringEntitlementResult(int);
} }
public abstract static class ConnectivityManager.OnTetheringEventCallback { 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_PROVISION_FAILED}, or
* {@link #TETHER_ERROR_ENTITLEMENT_UNKONWN}. * {@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) { protected void onReceiveResult(int resultCode, Bundle resultData) {
Binder.withCleanCallingIdentity(() -> Binder.withCleanCallingIdentity(() ->
executor.execute(() -> { executor.execute(() -> {
listener.onEntitlementResult(resultCode); listener.onTetheringEntitlementResult(resultCode);
})); }));
} }
}; };