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

Commit 2c0c2cd4 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 am: 7acb260e 

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

Change-Id: I1f605e588cc222299aa7488e140bcb96bab01e59
parents ae630996 7acb260e

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

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

     */

    @Override

    public void registerDefaultNetworkCallbackAsUid(

    public void registerDefaultNetworkCallbackForUid(

            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 Diff line number Diff line
@@ -45,8 +45,8 @@ public interface ConnectivityManagerShim { 
            @NonNull NetworkCallback networkCallback, @NonNull Handler handler)

            throws UnsupportedApiLevelException;



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

    default void registerDefaultNetworkCallbackAsUid(

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

    default void registerDefaultNetworkCallbackForUid(

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

            throws UnsupportedApiLevelException {

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