From 7943a83c2e2811fa427f99fd97e9a52832710d84 Mon Sep 17 00:00:00 2001
From: Mangesh Ghiware <mghiware@google.com>
Date: Tue, 8 Oct 2013 15:29:58 -0700
Subject: [PATCH] Fix incorrect usage of getComponentEnabledSetting()

Bug: 10912503

Change-Id: I9835995d121445ca170668ae8150a24e95e27544
---
 AndroidManifest.xml                              | 1 -
 src/com/android/gallery3d/util/GalleryUtils.java | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b372a8d0..8f48edf20 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -192,7 +192,6 @@
             android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/android:Theme.NoDisplay" />
         <activity-alias android:name="com.android.camera.CameraLauncher"
-            android:enabled="true"
             android:label="@string/camera_label"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java
index 83cc055c9..9a78fcd27 100644
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -238,7 +238,9 @@ public class GalleryUtils {
         ComponentName name = new ComponentName(context, CAMERA_LAUNCHER_NAME);
         int state = pm.getComponentEnabledSetting(name);
         sCameraAvailableInitialized = true;
-        sCameraAvailable = (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        sCameraAvailable =
+           (state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+           || (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         return sCameraAvailable;
     }
 
-- 
2.11.0