Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev

package android.accounts;

import android.app.Activity;

import android.app.ActivityTaskManager;

import android.content.res.Resources;

import android.os.Bundle;

import android.widget.TextView;

import android.widget.LinearLayout;

import android.view.View;

import android.view.LayoutInflater;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.LinearLayout;

import android.widget.TextView;

import com.android.internal.R;

import java.io.IOException;

    private Account mAccount;

    private String mAuthTokenType;

    private int mUid;

    private int mCallingUid;

    private Bundle mResultBundle = null;

    protected LayoutInflater mInflater;

            return;

        }

        try {

            IBinder activityToken = getActivityToken();

            mCallingUid = ActivityTaskManager.getService().getLaunchedFromUid(activityToken);

        } catch (RemoteException re) {

            // Couldn't figure out caller details

            Log.w(getClass().getSimpleName(), "Unable to get caller identity \n" + re);

        }

        if (!UserHandle.isSameApp(mCallingUid, Process.SYSTEM_UID) && mCallingUid != mUid) {

            setResult(Activity.RESULT_CANCELED);

            finish();

            return;

        }

        String accountTypeLabel;

        try {

            accountTypeLabel = getAccountLabel(mAccount);