Merge "Unbreak tethering for no offload supported devices"

This commit is contained in:
Mark Chien
2020-04-27 08:42:36 +00:00
committed by Gerrit Code Review

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