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

Commit 5486aabc authored by Erik Kline's avatar Erik Kline Committed by Android (Google) Code Review
Browse files

Merge "IpManager,DhcpClient: catch some errors and better logging" into nyc-dev

parents 42a6dc9b c2827857

services/net/java/android/net/dhcp/DhcpClient.java

+2 −2
Original line number Diff line number Diff line
@@ -264,8 +264,8 @@ public class DhcpClient extends StateMachine { 
            mInterfaceBroadcastAddr = new PacketSocketAddress(mIface.getIndex(),

                    DhcpPacket.ETHER_BROADCAST);

            return true;

        } catch(SocketException e) {

            Log.wtf(TAG, "Can't determine ifindex or MAC address for " + mIfaceName);

        } catch(SocketException | NullPointerException e) {

            Log.e(TAG, "Can't determine ifindex or MAC address for " + mIfaceName, e);

            return false;

        }

    }

services/net/java/android/net/ip/IpManager.java

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ public class IpManager extends StateMachine { 
            final InterfaceConfiguration ifcg = new InterfaceConfiguration();

            ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0"));

            mNwService.setInterfaceConfig(mInterfaceName, ifcg);

        } catch (RemoteException e) {

        } catch (IllegalStateException | RemoteException e) {

            Log.e(mTag, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e);

        }

    }