From dcb265c9d08029bbb8fd77d3514482d10db53a3c Mon Sep 17 00:00:00 2001 From: Ray Chen Date: Tue, 30 Aug 2011 12:06:17 +0800 Subject: Fix 5189197: NPE in MovieActivity Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce --- src/com/android/gallery3d/app/MovieActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3