summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java')
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index fc46716..a08f375 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -755,7 +755,7 @@ abstract class BaseActivity extends Activity {
* search currently.
*/
boolean cancelSearch() {
- if (mActionBar.hasExpandedActionView()) {
+ if (mActionBar != null && mActionBar.hasExpandedActionView()) {
mActionBar.collapseActionView();
return true;
}