Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I60ff11dc into eclair

Browse Source 
* changes:
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
This commit is contained in:
Android (Google) Code Review
2009-11-14 22:12:31 -08:00
parent 7c1c46000b 60ff11dc39
commit 383aa124de
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/accounts/GrantCredentialsPermissionActivity.java
View File

@@ -26,6 +26,7 @@ import android.view.ViewGroup;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.text.TextUtils;
import com.android.internal.R; import com.android.internal.R;
/** /**
@@ -59,7 +60,7 @@ public class GrantCredentialsPermissionActivity extends Activity implements View
TextView messageView = (TextView) getWindow().findViewById(R.id.message); TextView messageView = (TextView) getWindow().findViewById(R.id.message);
String authTokenLabel = getIntent().getExtras().getString(EXTRAS_AUTH_TOKEN_LABEL); String authTokenLabel = getIntent().getExtras().getString(EXTRAS_AUTH_TOKEN_LABEL);
if (authTokenLabel.length() == 0) { if (TextUtils.isEmpty(authTokenLabel)) {
CharSequence grantCredentialsPermissionFormat = getResources().getText( CharSequence grantCredentialsPermissionFormat = getResources().getText(
R.string.grant_credentials_permission_message_desc); R.string.grant_credentials_permission_message_desc);
messageView.setText(String.format(grantCredentialsPermissionFormat.toString(), messageView.setText(String.format(grantCredentialsPermissionFormat.toString(),