commit 86c516155feb7c0001e13434fb8b66fb4460b8e5
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 04 19:45:16 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 04 19:45:16 2021 +0000
tree ef6c07287a91c62e06fe25c8c951ccd638f02c9f
parent 2fcdd7431c11adbbc31255ea7c09b069615ad62c
parent 8098d8250e11557b7370da711c3c227fbdf1d1e4

Merge "Fix CarUiInstaller sometimes not called"

car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/core/CarUiInstaller.java

diff --git a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/core/CarUiInstaller.java b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/core/CarUiInstaller.java
index 4693b18..1378778 100644
--- a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/core/CarUiInstaller.java
+++ b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/core/CarUiInstaller.java
@@ -57,7 +57,7 @@
     @Override
     public boolean onCreate() {
         Context context = getContext();
-        if (context == null) {
+        if (context == null || !(context.getApplicationContext() instanceof Application)) {
             Log.e(TAG, "CarUiInstaller had a null context!");
             return false;
         }