commit b0938ab454234674f54d6cd66097351bed418499
author Mark Chien <markchien@google.com> Mon Apr 27 12:57:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 27 12:57:43 2020 +0000
tree 2896aff4a0d6e2b93068e4b15ba238d3696cffd8
parent 6f4b3d16cde12f00a6dcbe9d2ef18c3eab789b90
parent 3613937137353eb546f4d41bf75f840b295c7614

Merge "Unbreak tethering for no offload supported devices" into rvc-dev am: 48a2ffac38 am: 3613937137 am: eabfad6bfd

Change-Id: Ib3d04c521dc773d2bfc9e52050190786f0708466

Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java

diff --git a/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java b/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java
index 55344fc..c4a1078 100644
--- a/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java
+++ b/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java
@@ -41,6 +41,7 @@
 import java.net.SocketAddress;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.NoSuchElementException;
 
 
 /**
@@ -143,7 +144,7 @@
         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 @@
 
         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;
             }