Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b481b22b authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android Git Automerger
Browse files

am 7943a83c: Fix incorrect usage of getComponentEnabledSetting() 

* commit '7943a83c':
  Fix incorrect usage of getComponentEnabledSetting()
parents c3a1b05e 7943a83c

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

src/com/android/gallery3d/util/GalleryUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }