diff options
| author | 2019-03-12 23:57:05 -0700 | |
|---|---|---|
| committer | 2019-03-12 23:57:05 -0700 | |
| commit | 0869d3ec9b80c8338ee503fad63a2bb60995a3b1 (patch) | |
| tree | 4880d52a04d70daf4c870cf76175f8d6d7a23bf4 | |
| parent | fafa530b5e33d5ef662a0e51d4a2b377b3b722dc (diff) | |
| parent | 9eeac7326d49e4270258933995cc7a3606d2b4c9 (diff) | |
Merge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548 am: 33a9d34e8a
am: 9eeac7326d
Change-Id: Iba73611c9330463f4517ac1555b6ee000d740c71
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 3b3261b71f29..70eeacd6aad3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4069,7 +4069,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 { diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 3f8410f0cc7f..2a357ff2bcbb 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -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); })); } }; |