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

Commit 2367e75b authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 61db35da: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE 

* commit '61db35da':
  Make copies of NetworkInfo to give out.
parents 0042330e 61db35da

core/java/android/net/MobileDataStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { 
                    && lastReason != null)

                reason = lastReason;

            mNetworkInfo.setDetailedState(state, reason, extraInfo);

            Message msg = mTarget.obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo);

            Message msg = mTarget.obtainMessage(EVENT_STATE_CHANGED, new NetworkInfo(mNetworkInfo));

            msg.sendToTarget();

        }

    }

wifi/java/android/net/wifi/WifiStateTracker.java

+3 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class WifiStateTracker implements NetworkStateTracker { 
     * Fetch NetworkInfo for the network

     */

    public NetworkInfo getNetworkInfo() {

        return mNetworkInfo;

        return new NetworkInfo(mNetworkInfo);

    }



    /**
@@ -242,7 +242,8 @@ public class WifiStateTracker implements NetworkStateTracker { 
                } else {

                    mLastState = state;

                }

                Message msg = mCsHandler.obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo);

                Message msg = mCsHandler.obtainMessage(EVENT_STATE_CHANGED,

                        new NetworkInfo(mNetworkInfo));

                msg.sendToTarget();

            } else if (intent.getAction().equals(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION)) {

                mLinkProperties = (LinkProperties) intent.getParcelableExtra(