diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-10 17:49:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 17:49:54 -0700 |
| commit | 8a310a3975c3546be43c7ce3e2f11cf648fc59f5 (patch) | |
| tree | 5ed77879d8010294991937f5f46ce15cfa23e2d4 /src/com/android/camera/PhotoModule.java | |
| parent | 86ecc992272d4bc7d4d97057bf797bc1c5568363 (diff) | |
| parent | 8c80782326d1cdc764b9a9a791b2c5525e8ef234 (diff) | |
| download | android_packages_apps_Snap-8a310a3975c3546be43c7ce3e2f11cf648fc59f5.tar.gz android_packages_apps_Snap-8a310a3975c3546be43c7ce3e2f11cf648fc59f5.tar.bz2 android_packages_apps_Snap-8a310a3975c3546be43c7ce3e2f11cf648fc59f5.zip | |
am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
* commit '8c80782326d1cdc764b9a9a791b2c5525e8ef234':
Remove display change listener for mode switch
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ff28700c1..d06d7417e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1191,6 +1191,7 @@ public class PhotoModule } else { initializeSecondTime(); } + mUI.initDisplayChangeListener(); keepScreenOnAwhile(); UsageStatistics.onContentViewChanged( @@ -1261,6 +1262,7 @@ public class PhotoModule if (s != null) { s.setListener(null); } + mUI.removeDisplayChangeListener(); } /** |