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

Commit 182fea42 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ibb783aeacc0f15b865508f7e48ed43ef35a4933d
parents 62e1784b 48a2ffac

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;

            }