commit 47831439f9b52161c62d284070792b90b6b8077e
author Fred Quintana <fredq@google.com> Fri Nov 13 16:21:52 2009 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Sun Nov 15 11:45:35 2009 -0800
tree dd1106028a1bd0ebb207d88745a833659dced02a
parent 88ed600a7a83296b77cacf0ba8dfbafc2812ae52

fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange

core/java/android/accounts/GrantCredentialsPermissionActivity.java

diff --git a/core/java/android/accounts/GrantCredentialsPermissionActivity.java b/core/java/android/accounts/GrantCredentialsPermissionActivity.java
index e3ed2e9..4282c1b 100644
--- a/core/java/android/accounts/GrantCredentialsPermissionActivity.java
+++ b/core/java/android/accounts/GrantCredentialsPermissionActivity.java
@@ -26,6 +26,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.text.TextUtils;
 import com.android.internal.R;
 
 /**
@@ -59,7 +60,7 @@
 
         TextView messageView = (TextView) getWindow().findViewById(R.id.message);
         String authTokenLabel = getIntent().getExtras().getString(EXTRAS_AUTH_TOKEN_LABEL);
-        if (authTokenLabel.length() == 0) {
+        if (TextUtils.isEmpty(authTokenLabel)) {
             CharSequence grantCredentialsPermissionFormat = getResources().getText(
                     R.string.grant_credentials_permission_message_desc);
             messageView.setText(String.format(grantCredentialsPermissionFormat.toString(),