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

This project is archived. Its data is read-only.

Commit d276eb24 authored Apr 20, 2021 by Chiachang Wang

Update shim method to the updated API name

Rename ConnectiivityManager.registerDefaultNetworkCallbackAsUid
to registerDefaultNetworkCallbackForUid as the feedback from
API review. Update the usage in shim correspondingly.

Bug: 185246410
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I3a8b5020d0bd1c95e3a75910322301b5596be823
Merged-In: I3a8b5020d0bd1c95e3a75910322301b5596be823

parent 0ef9f63b

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