diff options
| author | Feixiong Zhang <feixiong@google.com> | 2015-06-04 18:54:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 18:54:49 +0000 |
| commit | 170d44083f9a8a71a17e01a3c199566b58029d46 (patch) | |
| tree | caa70b1bbd9371cfda5475b293a2858f21e2c685 /services/core/java/com/android/server/ConnectivityService.java | |
| parent | f8e5993c2c08bfed74e2e78e2f204420a4918dd9 (diff) | |
| parent | 376133f606338342de8a5261efd1155e2d99e470 (diff) | |
| download | frameworks_base-170d44083f9a8a71a17e01a3c199566b58029d46.zip frameworks_base-170d44083f9a8a71a17e01a3c199566b58029d46.tar.gz frameworks_base-170d44083f9a8a71a17e01a3c199566b58029d46.tar.bz2 | |
Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 928d1d6..44d00d7 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4509,7 +4509,7 @@ public class ConnectivityService extends IConnectivityManager.Stub info.setDetailedState(DetailedState.CONNECTED, null, info.getExtraInfo()); sendConnectedBroadcast(info); } else { - info.setDetailedState(DetailedState.DISCONNECTED, null, info.getExtraInfo()); + info.setDetailedState(DetailedState.DISCONNECTED, info.getReason(), info.getExtraInfo()); Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, info.getType()); |