summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-03-17 10:43:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-17 10:43:53 -0700
commita96db6e02142b0a9f2b652ff015760fd9b6bda28 (patch)
treebf70ffda0cfbae0f9a3a60e383ed6bc341ad3f92
parentd0812f4b505af58090c36653fd446d4bb454c5d0 (diff)
parentb38f88126b7ea255a884d06018d3d1c64e25bdff (diff)
downloadpackages_apps_Browser-a96db6e02142b0a9f2b652ff015760fd9b6bda28.zip
packages_apps_Browser-a96db6e02142b0a9f2b652ff015760fd9b6bda28.tar.gz
packages_apps_Browser-a96db6e02142b0a9f2b652ff015760fd9b6bda28.tar.bz2
am b38f8812: Prevent a NPE by checking mCallback.
* commit 'b38f88126b7ea255a884d06018d3d1c64e25bdff': Prevent a NPE by checking mCallback.
-rw-r--r--src/com/android/browser/DeviceAccountLogin.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/browser/DeviceAccountLogin.java b/src/com/android/browser/DeviceAccountLogin.java
index 818e076..8d734c2 100644
--- a/src/com/android/browser/DeviceAccountLogin.java
+++ b/src/com/android/browser/DeviceAccountLogin.java
@@ -107,8 +107,9 @@ public class DeviceAccountLogin implements
if (mTab.getDeviceAccountLogin() == null) {
displayLoginUi();
} else {
- assert mCallback != null;
- mCallback.loginFailed();
+ if (mCallback != null) {
+ mCallback.loginFailed();
+ }
}
}