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

Commit dbe4fa1f authored by Mark Chien's avatar Mark Chien
Browse files

Unbreak tethering for no offload supported devices 

Catch NoSuchElementException to unbreak no offload devices.

To consistent with fetching offload config service, retry fetcheing
offload control service.
b/152430668#comment4 assert that the fetch will be retried only
if the service is installed on the device.

Bug: 155026033
Test: run TetheringCoverageTests in virtual devices(do not support
offload)

Merged-In: Ie0a32a9062c722327a27c6de13e3bb8d9588bebb
Change-Id: Ie0a32a9062c722327a27c6de13e3bb8d9588bebb
parent 413ce328

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;

            }