Merge "Rename entitlement callback to adhere to API guidelines." am: 9e77cca082

am: de59c0cc99

Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
This commit is contained in:
Jeremy Klein
2019-03-12 23:36:36 -07:00
committed by android-build-merger

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);
})); }));
} }
}; };