Merge "Abort removing account if prohibited by policy"

2014-02-21 00:06:03 +00:00
parent 949131b660 5934dbc9f1
commit 1a405db22a
1 changed files with 1 additions and 0 deletions
--- 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();