Fix incorrect usage of getComponentEnabledSetting()

[android-x86/packages-apps-Gallery2.git] / src / com / android / gallery3d / util / GalleryUtils.java

diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java
index c25a2fc..9a78fcd 100644 (file)
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -37,7 +37,7 @@ import android.util.Log;
 import android.view.WindowManager;
 
 import com.android.gallery3d.R;
-import com.android.gallery3d.app.Gallery;
+import com.android.gallery3d.app.GalleryActivity;
 import com.android.gallery3d.app.PackagesMonitor;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.data.DataManager;
@@ -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;
     }
 
@@ -250,7 +252,7 @@ public class GalleryUtils {
     }
 
     public static void startGalleryActivity(Context context) {
-        Intent intent = new Intent(context, Gallery.class)
+        Intent intent = new Intent(context, GalleryActivity.class)
                 .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
                 | Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);