summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/MovieActivity.java
diff options
context:
space:
mode:
authorRay Chen <raychen@google.com>2011-08-30 12:06:17 +0800
committerRay Chen <raychen@google.com>2011-08-31 11:42:03 +0800
commit4105c5e73185c792c3576a20f620791e32dd316c (patch)
tree78e6af900ea3662d40a7e83c32f50459e93e0d9b /src/com/android/gallery3d/app/MovieActivity.java
parentea80ff93b6070ff671da46d6078cdf753cc6f8c3 (diff)
downloadandroid_packages_apps_Snap-4105c5e73185c792c3576a20f620791e32dd316c.tar.gz
android_packages_apps_Snap-4105c5e73185c792c3576a20f620791e32dd316c.tar.bz2
android_packages_apps_Snap-4105c5e73185c792c3576a20f620791e32dd316c.zip
Fix 5189197: NPE in MovieActivity
Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
Diffstat (limited to 'src/com/android/gallery3d/app/MovieActivity.java')
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index fea364e85..4c9be7ef0 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -18,6 +18,7 @@ package com.android.gallery3d.app;
import com.android.gallery3d.R;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -91,7 +92,8 @@ public class MovieActivity extends Activity {
if (cursor != null) cursor.close();
}
}
- if (title != null) getActionBar().setTitle(title);
+ ActionBar actionBar = getActionBar();
+ if (title != null && actionBar != null) actionBar.setTitle(title);
}
@Override