From 8d458981015b050e993e30b1db1ba800e8cd2f57 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Mon, 22 Oct 2018 11:13:38 -0700
Subject: [PATCH] Check StorageManagerInternal is published before using it.

Bug: 117938033
Test: N/A
Change-Id: I654c56e6cd2089a8eb524d1f32c047dc25f4feff
---
 .../core/java/com/android/server/pm/PackageManagerService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 1180af87ae34d..9399ebf5b413c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9539,7 +9539,7 @@ public class PackageManagerService extends IPackageManager.Stub
                         }
                     }
                 }
-                if (deleteSandboxData) {
+                if (deleteSandboxData && getStorageManagerInternal() != null) {
                     getStorageManagerInternal().destroySandboxForApp(pkg.packageName, realUserId);
                 }
             } catch (PackageManagerException e) {