Merge "Fix the empty reason field in connectivity change intent." into mnc-dev

This commit is contained in:
Feixiong Zhang
2015-06-04 18:54:41 +00:00
committed by Android (Google) Code Review

View File

@@ -4509,7 +4509,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
info.setDetailedState(DetailedState.CONNECTED, null, info.getExtraInfo()); info.setDetailedState(DetailedState.CONNECTED, null, info.getExtraInfo());
sendConnectedBroadcast(info); sendConnectedBroadcast(info);
} else { } else {
info.setDetailedState(DetailedState.DISCONNECTED, null, info.getExtraInfo()); info.setDetailedState(DetailedState.DISCONNECTED, info.getReason(), info.getExtraInfo());
Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION); Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, info.getType()); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, info.getType());