Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834b1e70 authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

am 383aa124: Merge change I60ff11dc into eclair 

Merge commit '383aa124' into eclair-plus-aosp

* commit '383aa124':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
parents b201f726 383aa124

core/java/android/accounts/GrantCredentialsPermissionActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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(),