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

Merge "Merge "Unbreak tethering for no offload supported devices" am: cb22e06783 am: 98c0b261f8" into rvc-dev-plus-aosp am: 3ba6bfb69e am: 676d1785f7

Browse Source 
Change-Id: I2834378bd1eae9c0ce3621d2dc7fe1d7558feb05
This commit is contained in:
Automerger Merge Worker
2020-04-27 09:47:46 +00:00
parent f440c07e50 676d1785f7
commit 354ee4dd51
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java
View File

@@ -41,6 +41,7 @@ import java.io.IOException;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.net.SocketException; import java.net.SocketException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.NoSuchElementException;
/** /**
@@ -143,7 +144,7 @@ public class OffloadHardwareInterface {
IOffloadConfig offloadConfig; IOffloadConfig offloadConfig;
try { try {
offloadConfig = IOffloadConfig.getService(true /*retry*/); offloadConfig = IOffloadConfig.getService(true /*retry*/);
} catch (RemoteException e) { } catch (RemoteException | NoSuchElementException e) {
mLog.e("getIOffloadConfig error " + e); mLog.e("getIOffloadConfig error " + e);
return false; return false;
} }
@@ -239,8 +240,8 @@ public class OffloadHardwareInterface {
if (mOffloadControl == null) { if (mOffloadControl == null) {
try { try {
mOffloadControl = IOffloadControl.getService(); mOffloadControl = IOffloadControl.getService(true /*retry*/);
} catch (RemoteException e) { } catch (RemoteException | NoSuchElementException e) {
mLog.e("tethering offload control not supported: " + e); mLog.e("tethering offload control not supported: " + e);
return false; return false;
} }