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

Commit b3a98725 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev

parents 5c58a916 23c8b96a

core/java/android/accounts/CantAddAccountActivity.java

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.accounts;





import android.app.Activity;

import android.os.Bundle;

import android.view.View;



import com.android.internal.R;



/**

 * @hide

 * Just shows an error message about the account restrictions for the limited user.

 */

public class CantAddAccountActivity extends Activity {



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.app_not_authorized);

    }



    public void onCancelButtonClicked(View view) {

        onBackPressed();

    }

}

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -2272,6 +2272,14 @@ 
                android:process=":ui">

        </activity>



        <activity android:name="android.accounts.CantAddAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@android:style/Theme.Holo.Dialog"

                android:label="@string/error_message_title"

                android:process=":ui">

        </activity>



        <activity android:name="android.accounts.GrantCredentialsPermissionActivity"

                android:excludeFromRecents="true"

                android:exported="true"

services/java/com/android/server/accounts/AccountManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.accounts.AccountAndUser; 
import android.accounts.AccountAuthenticatorResponse;

import android.accounts.AccountManager;

import android.accounts.AuthenticatorDescription;

import android.accounts.CantAddAccountActivity;

import android.accounts.GrantCredentialsPermissionActivity;

import android.accounts.IAccountAuthenticator;

import android.accounts.IAccountAuthenticatorResponse;
@@ -1456,6 +1457,14 @@ public class AccountManagerService 
                        "User is not allowed to add an account!");

            } catch (RemoteException re) {

            }

            Intent cantAddAccount = new Intent(mContext, CantAddAccountActivity.class);

            cantAddAccount.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            long identityToken = clearCallingIdentity();

            try {

                mContext.startActivityAsUser(cantAddAccount, UserHandle.CURRENT);

            } finally {

                restoreCallingIdentity(identityToken);

            }

            return;

        }