Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71dd69e1 authored by Mark Chien's avatar Mark Chien Committed by Gerrit Code Review
Browse files

Merge "Unbreak tethering for no offload supported devices"

parents fd0d3706 c5534380

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

+4 −3
Original line number Diff line number Diff line
@@ -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;

            }