summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-03-25 13:19:51 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:19 -0700
commit24fada687dd75b4e1ede81528840d9ed061f0c60 (patch)
treefad87d5fa9654df4585ea41c6613ddb4df44dee5
parent450a39349f2d0b27de110e68201b2844448f5d34 (diff)
downloadandroid_packages_apps_Gallery2-24fada687dd75b4e1ede81528840d9ed061f0c60.tar.gz
android_packages_apps_Gallery2-24fada687dd75b4e1ede81528840d9ed061f0c60.tar.bz2
android_packages_apps_Gallery2-24fada687dd75b4e1ede81528840d9ed061f0c60.zip
MoviePlayer: fix a crash
Fix possible NullPointerException in setActionBarTitle(). Change-Id: Ie5fdb1c60e9db147c1a06534d2c2dbbbe64a5edb
-rwxr-xr-xsrc/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 325930746..b7ac3b1a4 100755
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -766,7 +766,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);
}
}