summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-07-01 13:46:04 -0700
committerd34d <clark@cyngn.com>2016-07-01 13:46:04 -0700
commit43c7edbcda3c720b52137b81eaf8ff2288a61a0a (patch)
tree11bd89c83e29e50a8d410760ac9d89a3e31a0fd0 /src/com
parentc1813e30bb93fae6d14fbf375c9c39f724fb06ac (diff)
downloadandroid_packages_screensavers_Basic-43c7edbcda3c720b52137b81eaf8ff2288a61a0a.tar.gz
android_packages_screensavers_Basic-43c7edbcda3c720b52137b81eaf8ff2288a61a0a.tar.bz2
android_packages_screensavers_Basic-43c7edbcda3c720b52137b81eaf8ff2288a61a0a.zip
Avoid potential NPE when tearing down LLS
Change-Id: Ifab8e7426c88a9d54f8986a6ff065382720bdfe2
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/dreams/basic/ColorsLockScreen.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dreams/basic/ColorsLockScreen.java b/src/com/android/dreams/basic/ColorsLockScreen.java
index baee696..4cfd9c5 100644
--- a/src/com/android/dreams/basic/ColorsLockScreen.java
+++ b/src/com/android/dreams/basic/ColorsLockScreen.java
@@ -146,7 +146,7 @@ public class ColorsLockScreen extends KeyguardExternalViewProviderService {
});
try {
- mRendererHandlerThread.join();
+ if (mRendererHandlerThread != null) mRendererHandlerThread.join();
} catch (InterruptedException e) {
LOG("Error while waiting for renderer", e);
}