summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2016-09-29 21:34:32 +0800
committerAdrian DC <radian.dc@gmail.com>2016-12-03 22:23:12 +0100
commit5d075c560d55f51e0048cbde25f8a41a672136cc (patch)
treed13aa4a4892e5b751579ec43421aa559f1a5fe4d
parentbe40ea1d88509a2f51e349dbc74c6e7371c85424 (diff)
downloadandroid_packages_apps_Gallery2-stable/cm-13.0-ZNH5Y.tar.gz
android_packages_apps_Gallery2-stable/cm-13.0-ZNH5Y.tar.bz2
android_packages_apps_Gallery2-stable/cm-13.0-ZNH5Y.zip
Fix null pointer crashingstable/cm-13.0-ZNH5Y
RM-290 Change-Id: Ie55d1c37c05b334398b713db17353885a9125e3a
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 275b04ab3..fe0539047 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -781,7 +781,7 @@ public class MovieActivity extends Activity {
Log.v(TAG, "setActionBarTitle(" + title + ")");
}
ActionBar actionBar = getActionBar();
- if (title != null) {
+ if (actionBar != null && title != null) {
actionBar.setTitle(title);
}
}