summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-02-17 07:40:50 -0500
committerMike Lockwood <lockwood@android.com>2010-02-17 07:40:50 -0500
commita4437fc93a993c7ab326b592d22c05be2f11b543 (patch)
tree78dd3d856d7afc20c90302f46137f9f0539aa62c
parent0a05f5dfebc3dc6ee8797cfe59f33faa12d660ba (diff)
downloadframeworks_base-a4437fc93a993c7ab326b592d22c05be2f11b543.zip
frameworks_base-a4437fc93a993c7ab326b592d22c05be2f11b543.tar.gz
frameworks_base-a4437fc93a993c7ab326b592d22c05be2f11b543.tar.bz2
Fix null pointer exception in connectivity service broadcast receiver.
Change-Id: I80c7175ffd1a323a02201395ff6092e2ab0fdd1c Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--services/java/com/android/server/connectivity/Tethering.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
index 8d4f244..1d20074 100644
--- a/services/java/com/android/server/connectivity/Tethering.java
+++ b/services/java/com/android/server/connectivity/Tethering.java
@@ -431,7 +431,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
try {
NetworkInfo info = service.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_DUN);
int msg;
- if (info.isConnected() == true) {
+ if (info != null && info.isConnected() == true) {
msg = TetherMasterSM.CMD_CELL_DUN_ENABLED;
} else {
msg = TetherMasterSM.CMD_CELL_DUN_DISABLED;