diff options
| -rw-r--r-- | core/java/android/accounts/CantAddAccountActivity.java | 40 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | services/java/com/android/server/accounts/AccountManagerService.java | 9 |
3 files changed, 57 insertions, 0 deletions
diff --git a/core/java/android/accounts/CantAddAccountActivity.java b/core/java/android/accounts/CantAddAccountActivity.java new file mode 100644 index 000000000000..e1717a66d34e --- /dev/null +++ b/core/java/android/accounts/CantAddAccountActivity.java @@ -0,0 +1,40 @@ +/* + * 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(); + } +} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8ebc88c366a2..6b4fe7962ed6 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" diff --git a/services/java/com/android/server/accounts/AccountManagerService.java b/services/java/com/android/server/accounts/AccountManagerService.java index 14d808f842d6..fd7cd784aa9b 100644 --- a/services/java/com/android/server/accounts/AccountManagerService.java +++ b/services/java/com/android/server/accounts/AccountManagerService.java @@ -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; } |