diff options
| author | Fred Quintana <fredq@google.com> | 2009-11-13 16:21:52 -0800 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2009-11-13 16:21:52 -0800 |
| commit | 60ff11dc393931c10845568bf43b6674dde04a82 (patch) | |
| tree | 925abd667299f2acf56a3be3f53aeabceef42d78 | |
| parent | b4c20fca102a2ec6acf1648f2fd16d54fdc07f56 (diff) | |
| download | frameworks_base-60ff11dc393931c10845568bf43b6674dde04a82.zip frameworks_base-60ff11dc393931c10845568bf43b6674dde04a82.tar.gz frameworks_base-60ff11dc393931c10845568bf43b6674dde04a82.tar.bz2 | |
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
| -rw-r--r-- | core/java/android/accounts/GrantCredentialsPermissionActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
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.view.ViewGroup; 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 @@ public class GrantCredentialsPermissionActivity extends Activity implements View 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(), |