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

Commit a2bfd3f9 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Update shim method to the updated API name" into sc-dev

parents b0368652 4ef475f2

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