From 521b2bd4839f7dba43b8f705da5863d64b534311 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 4 Jun 2014 11:52:08 -0700 Subject: [PATCH] Fix ethernet. It was attempting to update the NetworkAgent before the NetworkAgent was created, causing NullPointerExceptions. bug:15407938 Change-Id: Ie36b906df4b12f095a16d1b30c847a55b074d60c --- .../server/ethernet/EthernetNetworkFactory.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java index bbbdacaf62..820e16b566 100644 --- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java @@ -136,7 +136,6 @@ class EthernetNetworkFactory { // Tell the agent we're disconnected. It will call disconnect(). mNetworkInfo.setDetailedState(DetailedState.DISCONNECTED, null, mHwAddr); } - mNetworkAgent.sendNetworkScore(mLinkUp? NETWORK_SCORE : -1); updateAgent(); mFactory.setScoreFilter(up ? NETWORK_SCORE : -1); } @@ -264,9 +263,6 @@ class EthernetNetworkFactory { setStaticIpAddress(linkProperties); } else { mNetworkInfo.setDetailedState(DetailedState.OBTAINING_IPADDR, null, mHwAddr); - synchronized (EthernetNetworkFactory.this) { - mNetworkAgent.sendNetworkInfo(mNetworkInfo); - } DhcpResults dhcpResults = new DhcpResults(); // TODO: Handle DHCP renewals better. @@ -276,13 +272,6 @@ class EthernetNetworkFactory { // noticing. if (!NetworkUtils.runDhcp(mIface, dhcpResults)) { Log.e(TAG, "DHCP request error:" + NetworkUtils.getDhcpError()); - synchronized(EthernetNetworkFactory.this) { - // DHCP failed. Tell the agent we now have a score - // of 0, and it will call disconnect for us. We'll - // attempt to reconnect when we next see a link up - // event, which resets the score to NETWORK_SCORE. - mNetworkAgent.sendNetworkScore(-1); - } mFactory.setScoreFilter(-1); return; }