diff options
| author | Ray Chen <raychen@google.com> | 2011-08-30 12:06:17 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2011-08-31 11:42:03 +0800 |
| commit | dcb265c9d08029bbb8fd77d3514482d10db53a3c (patch) | |
| tree | 035a812ffef360e54f5e90026ba9cae1f6adfe7e | |
| parent | 94c1caed4720fef052fcd9b0712b748bd23cc45b (diff) | |
| download | android_packages_apps_Gallery2-dcb265c9d08029bbb8fd77d3514482d10db53a3c.tar.gz android_packages_apps_Gallery2-dcb265c9d08029bbb8fd77d3514482d10db53a3c.tar.bz2 android_packages_apps_Gallery2-dcb265c9d08029bbb8fd77d3514482d10db53a3c.zip | |
Fix 5189197: NPE in MovieActivity
Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
| -rw-r--r-- | src/com/android/gallery3d/app/MovieActivity.java | 4 |
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 |