summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-16 13:17:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-16 13:17:36 +0000
commit8d29b6d4ebd309bde7f69d5aaed293f6e810b877 (patch)
tree3225ece03ee0491ed5df08d6fccc74c4ce5ecb38 /core/java/android
parentf479aafe4250face8625777c8a847b8dda407214 (diff)
parentaa0e6344c14d4d10a61800b87b20b65e7788b3bb (diff)
Merge "Improve DSU log and notification message" am: 03e365f649 am: aa0e6344c1
Change-Id: I5ba1a7499c53d4b1a70a0ed6ba279cff742422c7
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/image/DynamicSystemClient.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/os/image/DynamicSystemClient.java b/core/java/android/os/image/DynamicSystemClient.java
index 921f0f2ab1e2..5cb33615fe22 100644
--- a/core/java/android/os/image/DynamicSystemClient.java
+++ b/core/java/android/os/image/DynamicSystemClient.java
@@ -256,9 +256,13 @@ public class DynamicSystemClient {
mService.send(msg);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to get status from installation service");
- mExecutor.execute(() -> {
+ if (mExecutor != null) {
+ mExecutor.execute(() -> {
+ mListener.onStatusChanged(STATUS_UNKNOWN, CAUSE_ERROR_IPC, 0, e);
+ });
+ } else {
mListener.onStatusChanged(STATUS_UNKNOWN, CAUSE_ERROR_IPC, 0, e);
- });
+ }
}
}