commit 14fc1978e70d3243ca08a352a56e2841bc88d931
author Nicolas Prevot <nprevot@google.com> Wed Aug 24 14:21:38 2016 +0100
committer Nicolas Prevot <nprevot@google.com> Wed Aug 24 14:21:38 2016 +0100
tree af2982ec33d35d91c6b64a79e8761c7fe7709b52
parent 575bb0fd33aadbead46796e70490a178ed4772b4

In AccountManagerService, don't crash if there's no dpm.

BUG:31015735
Change-Id: I0857008576c11857f52cdc2233fd3e3566e62268

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

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 53e6a55..ef0f1ee 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3420,7 +3420,9 @@
         final DevicePolicyManagerInternal dpmi =
                 LocalServices.getService(DevicePolicyManagerInternal.class);
         Intent intent = null;
-        if (errorCode == AccountManager.ERROR_CODE_USER_RESTRICTED) {
+        if (dpmi == null) {
+            intent = getDefaultCantAddAccountIntent(errorCode);
+        } else if (errorCode == AccountManager.ERROR_CODE_USER_RESTRICTED) {
             intent = dpmi.createUserRestrictionSupportIntent(userId,
                     UserManager.DISALLOW_MODIFY_ACCOUNTS);
         } else if (errorCode == AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE) {