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

Commit 7acb260e authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update shim method to the updated API name" am: 96c393ac 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1679671

Change-Id: I9ad757c498fd91496a9e6bbb739da65f0ccdabf5
parents b413a95b 96c393ac

apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,9 +76,9 @@ public class ConnectivityManagerShimImpl 
     * See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid

     * See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid

     */

     */

    @Override

    @Override

    public void registerDefaultNetworkCallbackAsUid(

    public void registerDefaultNetworkCallbackForUid(

            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {

            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {

        mCm.registerDefaultNetworkCallbackAsUid(uid, networkCallback, handler);

        mCm.registerDefaultNetworkCallbackForUid(uid, networkCallback, handler);

    }

    }





    /**

    /**

apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -45,8 +45,8 @@ public interface ConnectivityManagerShim { 
            @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            throws UnsupportedApiLevelException;

            throws UnsupportedApiLevelException;





    /** See android.net.ConnectivityManager#registerDefaultNetworkCallbackAsUid */

    /** See android.net.ConnectivityManager#registerDefaultNetworkCallbackForUid */

    default void registerDefaultNetworkCallbackAsUid(

    default void registerDefaultNetworkCallbackForUid(

            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            throws UnsupportedApiLevelException {

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Only supported starting from API 31");

        throw new UnsupportedApiLevelException("Only supported starting from API 31");