summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2016-09-29 13:34:32 (GMT)
committerChih-Wei Huang <cwhuang@android-x86.org>2016-09-29 14:20:42 (GMT)
commit2f766165a59dc730d264535b8dfa2db9818712d1 (patch)
tree4161e7261949232c72069c65e214cb22aaca875e
parentebffdae38b0e1ca285f50ddce30e54419d5f0424 (diff)
downloadandroid_packages_apps_Gallery2-2f766165a59dc730d264535b8dfa2db9818712d1.zip
android_packages_apps_Gallery2-2f766165a59dc730d264535b8dfa2db9818712d1.tar.gz
android_packages_apps_Gallery2-2f766165a59dc730d264535b8dfa2db9818712d1.tar.bz2
Fix null pointer crashing
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 275b04a..fe05390 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);
}
}