summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/ActivityState.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-11-30 13:19:17 +0800
committerChih-Chung Chang <chihchung@google.com>2011-11-30 13:19:39 +0800
commit9e22248b0e17d4ceafe6c2d774c566504eb87520 (patch)
tree02c863f8f9da68f6b934a91a79d36cf05ba5cfb1 /src/com/android/gallery3d/app/ActivityState.java
parentcdbaba43954012a317119cc20183eb4de5220e58 (diff)
downloadandroid_packages_apps_Snap-9e22248b0e17d4ceafe6c2d774c566504eb87520.tar.gz
android_packages_apps_Snap-9e22248b0e17d4ceafe6c2d774c566504eb87520.tar.bz2
android_packages_apps_Snap-9e22248b0e17d4ceafe6c2d774c566504eb87520.zip
Fix 5686493: Crash when try to click any thumbnail
Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r--src/com/android/gallery3d/app/ActivityState.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 1ef93a4bc..1563a09ca 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -127,7 +127,9 @@ abstract public class ActivityState {
}
protected void onPause() {
- ((Activity) mActivity).unregisterReceiver(mPowerIntentReceiver);
+ if (0 != (mFlags & FLAG_SCREEN_ON)) {
+ ((Activity) mActivity).unregisterReceiver(mPowerIntentReceiver);
+ }
}
// should only be called by StateManager