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

Commit 7c8494e6 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching... 

am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev

* commit 'dc8079ac835290e5f7e721a72a9e9f60c7ae048e':
  Fix regression in launching CantAddAccountActivity for correct user
parents 4a3b843f 4872bdd7

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

+8 −6
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ public class AccountManagerService 
                        "User is not allowed to add an account!");

            } catch (RemoteException re) {

            }

            showCantAddAccount(AccountManager.ERROR_CODE_USER_RESTRICTED);

            showCantAddAccount(AccountManager.ERROR_CODE_USER_RESTRICTED, userId);

            return;

        }

        if (!canUserModifyAccountsForType(userId, accountType)) {
@@ -1796,7 +1796,8 @@ public class AccountManagerService 
                        "User cannot modify accounts of this type (policy).");

            } catch (RemoteException re) {

            }

            showCantAddAccount(AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE);

            showCantAddAccount(AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE,

                    userId);

            return;

        }
@@ -1861,7 +1862,7 @@ public class AccountManagerService 
                        "User is not allowed to add an account!");

            } catch (RemoteException re) {

            }

            showCantAddAccount(AccountManager.ERROR_CODE_USER_RESTRICTED);

            showCantAddAccount(AccountManager.ERROR_CODE_USER_RESTRICTED, userId);

            return;

        }

        if (!canUserModifyAccountsForType(userId, accountType)) {
@@ -1870,7 +1871,8 @@ public class AccountManagerService 
                        "User cannot modify accounts of this type (policy).");

            } catch (RemoteException re) {

            }

            showCantAddAccount(AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE);

            showCantAddAccount(AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE,

                    userId);

            return;

        }
@@ -1906,13 +1908,13 @@ public class AccountManagerService 
        }

    }



    private void showCantAddAccount(int errorCode) {

    private void showCantAddAccount(int errorCode, int userId) {

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

        cantAddAccount.putExtra(CantAddAccountActivity.EXTRA_ERROR_CODE, errorCode);

        cantAddAccount.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        long identityToken = clearCallingIdentity();

        try {

            mContext.startActivity(cantAddAccount);

            mContext.startActivityAsUser(cantAddAccount, new UserHandle(userId));

        } finally {

            restoreCallingIdentity(identityToken);

        }