diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-10-10 19:40:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 19:40:59 -0700 |
| commit | 886c3a5fabf59d8529910f34f155fb4565d5a4d2 (patch) | |
| tree | b93b4627ff10a7bbc68a38df255941205bad651e | |
| parent | 6cad9e09bef494a3ae9f19049ad8fa501d134613 (diff) | |
| parent | 2a959b838d9a20830d15f916a8a698f18582da5c (diff) | |
| download | android_packages_apps_Snap-886c3a5fabf59d8529910f34f155fb4565d5a4d2.tar.gz android_packages_apps_Snap-886c3a5fabf59d8529910f34f155fb4565d5a4d2.tar.bz2 android_packages_apps_Snap-886c3a5fabf59d8529910f34f155fb4565d5a4d2.zip | |
am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad
* commit '2a959b838d9a20830d15f916a8a698f18582da5c':
Don't initialize photo module if it's paused.
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d06d7417e..3dbf4efe0 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -18,12 +18,10 @@ package com.android.camera; import android.annotation.TargetApi; import android.app.Activity; -import android.content.BroadcastReceiver; import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.SharedPreferences.Editor; import android.content.res.Configuration; import android.graphics.Bitmap; @@ -528,7 +526,9 @@ public class PhotoModule // once only. We could have done these things in onCreate() but we want to // make preview screen appear as soon as possible. private void initializeFirstTime() { - if (mFirstTimeInitialized) return; + if (mFirstTimeInitialized || mPaused) { + return; + } // Initialize location service. boolean recordLocation = RecordLocationPreference.get( |