From ca5530ed1d967a31f551224db8c7ee2f98ac52e4 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 9 Jul 2021 10:10:50 +0900 Subject: [PATCH] Remove catch clause on compat shim registerSystemDefaultNetworkCallback no longer throws UnsupportedApiLevelException as it has compatibility behavior down to Q, so remove the catch clause for the checked exception. The exception would previously not be thrown since the Tethering module is only running on R+. Bug: 182961265 Test: atest TetheringTests Change-Id: I3c58235f3a59294995e5f32502fec6ccd17a3cf0 --- .../networkstack/tethering/UpstreamNetworkMonitor.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java index 69471a1516..5584db236f 100644 --- a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java +++ b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java @@ -49,7 +49,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.StateMachine; import com.android.networkstack.apishim.ConnectivityManagerShimImpl; import com.android.networkstack.apishim.common.ConnectivityManagerShim; -import com.android.networkstack.apishim.common.UnsupportedApiLevelException; import java.util.HashMap; import java.util.HashSet; @@ -162,12 +161,7 @@ public class UpstreamNetworkMonitor { } ConnectivityManagerShim mCmShim = ConnectivityManagerShimImpl.newInstance(mContext); mDefaultNetworkCallback = new UpstreamNetworkCallback(CALLBACK_DEFAULT_INTERNET); - try { - mCmShim.registerSystemDefaultNetworkCallback(mDefaultNetworkCallback, mHandler); - } catch (UnsupportedApiLevelException e) { - Log.wtf(TAG, "registerSystemDefaultNetworkCallback is not supported"); - return; - } + mCmShim.registerSystemDefaultNetworkCallback(mDefaultNetworkCallback, mHandler); if (mEntitlementMgr == null) { mEntitlementMgr = entitle; }