Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Unbreak tethering for no offload supported devices" am: 71dd69e10a am: 89fbc9959d" into rvc-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-04-27 09:12:55 +00:00
committed by Android (Google) Code Review
parent edfff9e687 c5e04cc266
commit 3ba6bfb69e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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