diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2013-09-23 18:34:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-23 18:34:53 +0000 |
| commit | 889b1b25b9928624ea1ca51cba51642d5cf4044d (patch) | |
| tree | 9a757afe4a4abab9e299ba6fa0d2f3d41961b0e3 /src/com/android/gallery3d/util | |
| parent | 32646aabd8228e1494ba090a02ffb8adaa369127 (diff) | |
| parent | 5cf48128283db1def078dea4cc57ee10195e9a47 (diff) | |
| download | android_packages_apps_Gallery2-889b1b25b9928624ea1ca51cba51642d5cf4044d.tar.gz android_packages_apps_Gallery2-889b1b25b9928624ea1ca51cba51642d5cf4044d.tar.bz2 android_packages_apps_Gallery2-889b1b25b9928624ea1ca51cba51642d5cf4044d.zip | |
Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/gallery3d/util')
| -rw-r--r-- | src/com/android/gallery3d/util/GalleryUtils.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java index 9245e2c5f..c25a2fc66 100644 --- a/src/com/android/gallery3d/util/GalleryUtils.java +++ b/src/com/android/gallery3d/util/GalleryUtils.java @@ -238,9 +238,7 @@ public class GalleryUtils { ComponentName name = new ComponentName(context, CAMERA_LAUNCHER_NAME); int state = pm.getComponentEnabledSetting(name); sCameraAvailableInitialized = true; - sCameraAvailable = - (state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) - || (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED); + sCameraAvailable = (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED); return sCameraAvailable; } |