summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2014-02-21 00:06:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-02-21 00:06:03 +0000
commit1a405db22a2ade6b745f3e1cf93ba0c54b048d95 (patch)
treefeb11df3d50c2874087989ca9422d42908ba17ba
parent949131b6605f9dafc069eb918ff003a55f72d934 (diff)
parent5934dbc9f12936b7faf592660a28b4bbcff0cdd0 (diff)
Merge "Abort removing account if prohibited by policy"
-rw-r--r--services/core/java/com/android/server/accounts/AccountManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index aa9849ef5641..f587cccdd419 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();