From 5934dbc9f12936b7faf592660a28b4bbcff0cdd0 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 20 Feb 2014 15:23:36 -0800
Subject: [PATCH] Abort removing account if prohibited by policy

Bug: 13077993

If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.

Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
---
 .../java/com/android/server/accounts/AccountManagerService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index aa9849ef56416..f587cccdd419d 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -863,6 +863,7 @@ public class AccountManagerService
                         "User cannot modify accounts");
             } catch (RemoteException re) {
             }
+            return;
         }
 
         long identityToken = clearCallingIdentity();