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

am: 9ac0bea512

Change-Id: Iba73611c9330463f4517ac1555b6ee000d740c71
This commit is contained in:
Jeremy Klein
2019-03-12 23:57:05 -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_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);
}));
}
};