Fix incorrect usage of getComponentEnabledSetting()

Bug: 10912503

Change-Id: I9835995d121445ca170668ae8150a24e95e27544

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b372a8..8f48edf 100644 (file)
--- 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 83cc055..9a78fcd 100644 (file)
--- 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;
     }