Merge "Check for initialization of mUpdateEngine" am: e3a84af1a7 am: 0d39f92360

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907970

Change-Id: I10d42d3c1a27430b377c0363e91a7e37b246ef07

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java
index 3e01c53f0469..b7e3068a437c 100644
--- a/core/java/android/os/UpdateEngine.java
+++ b/core/java/android/os/UpdateEngine.java
@@ -238,7 +238,7 @@ public class UpdateEngine {
         public static final int DISABLED = 9;
     }
 
-    private IUpdateEngine mUpdateEngine;
+    private final IUpdateEngine mUpdateEngine;
     private IUpdateEngineCallback mUpdateEngineCallback = null;
     private final Object mUpdateEngineCallbackLock = new Object();
 
@@ -248,6 +248,9 @@ public class UpdateEngine {
     public UpdateEngine() {
         mUpdateEngine = IUpdateEngine.Stub.asInterface(
                 ServiceManager.getService(UPDATE_ENGINE_SERVICE));
+        if (mUpdateEngine == null) {
+            throw new IllegalStateException("Failed to find update_engine");
+        }
     }
 
     /**