LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove catch clause on compat shim" am: 5b37955322 am: 19122edbc5 am: 2cff18c9f5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760688

Change-Id: I0a75b7759892b86647bd142e9fa5ffd2cdf2867a
This commit is contained in:
Remi NGUYEN VAN
2021-07-12 04:32:02 +00:00
committed by Automerger Merge Worker
parent 2205be85bb 2cff18c9f5
commit 44f31fd1c0
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
View File

@@ -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;
}