commit a3c10cd22bbf718dde08aac357a3fb164352f443
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 13 04:48:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 13 04:48:24 2019 +0000
tree abe4461df870b53c34e5258f649d957f70350e37
parent 40f6974c7af48bc13d1ef9e380bd9cc112d72ada
parent a9aad903989a95470ada98105b26e485e0ce1f00

Merge "Rename entitlement callback to adhere to API guidelines."

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 3f8410f..2a357ff 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2805,7 +2805,7 @@
          *         {@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 @@
             protected void onReceiveResult(int resultCode, Bundle resultData) {
                 Binder.withCleanCallingIdentity(() ->
                             executor.execute(() -> {
-                                listener.onEntitlementResult(resultCode);
+                                listener.onTetheringEntitlementResult(resultCode);
                             }));
             }
         };