Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a9d34e authored by Jeremy Klein's avatar Jeremy Klein Committed by android-build-merger
Browse files

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

am: 0102e3d5

Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
parents c078d39d 0102e3d5

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3124,7 +3124,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 {

































core/java/android/net/ConnectivityManager.java



+2
−2




























Original line number
Diff line number
Diff line








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















                            }));















            }















        };