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

Commit 86e4adcc authored by Rashed Abdel-Tawab's avatar Rashed Abdel-Tawab Committed by Rashed Abdel-Tawab
Browse files

camera: Make secondary camera package list opt out 

Secondary cameras work fine on our platform; there is no reason to
disable them by default. Convert the opt-in package list to be opt-out
to allow disabling packages with known incompatibilities with the dual
camera setup (looking at you Snapchat)

Change-Id: Ie80434c3db160a424c346ff09b30191147a32b32
parent 68c2f178

core/java/android/hardware/Camera.java

+5 −5
Original line number Diff line number Diff line
@@ -248,18 +248,18 @@ public class Camera { 
     * Returns the number of physical cameras available on this device.

     */

    public static int getNumberOfCameras() {

        boolean exposeAuxCamera = false;

        boolean exposeAuxCamera = true;

        String packageName = ActivityThread.currentOpPackageName();

        /* Force to expose only two cameras

         * if the package name does not falls in this bucket

        /* Force exposing only two cameras

         * if the package name falls in this bucket

         */

        String packageList = SystemProperties.get("camera.aux.packagelist");

        String packageList = SystemProperties.get("camera.auxdisable.packagelist");

        if (packageList.length() > 0) {

            TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');

            splitter.setString(packageList);

            for (String str : splitter) {

                if (packageName.equals(str)) {

                    exposeAuxCamera = true;

                    exposeAuxCamera = false;

                    break;

                }

            }

core/java/android/hardware/camera2/CameraManager.java

+10 −10
Original line number Diff line number Diff line
@@ -692,18 +692,18 @@ public final class CameraManager { 


            try {

                numCameras = cameraService.getNumberOfCameras(CAMERA_TYPE_ALL);

                /* Force to expose only two cameras

                 * if the package name does not falls in this bucket

                /* Force to exposing only two cameras

                 * if the package name falls in this bucket

                 */

                boolean exposeAuxCamera = false;

                boolean exposeAuxCamera = true;

                String packageName = ActivityThread.currentOpPackageName();

                String packageList = SystemProperties.get("camera.aux.packagelist");

                String packageList = SystemProperties.get("camera.auxdisable.packagelist");

                if (packageList.length() > 0) {

                    TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');

                    splitter.setString(packageList);

                    for (String str : splitter) {

                        if (packageName.equals(str)) {

                            exposeAuxCamera = true;

                            exposeAuxCamera = false;

                            break;

                        }

                    }
@@ -1038,18 +1038,18 @@ public final class CameraManager { 
        }



        private void onStatusChangedLocked(int status, String id) {

            /* Force to ignore the last mono/aux camera status update

             * if the package name does not falls in this bucket

            /* Force ignoring the last mono/aux camera status update

             * if the package name falls in this bucket

             */

            boolean exposeMonoCamera = false;

            boolean exposeMonoCamera = true;

            String packageName = ActivityThread.currentOpPackageName();

            String packageList = SystemProperties.get("camera.aux.packagelist");

            String packageList = SystemProperties.get("camera.auxdisable.packagelist");

            if (packageList.length() > 0) {

                TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');

                splitter.setString(packageList);

                for (String str : splitter) {

                    if (packageName.equals(str)) {

                        exposeMonoCamera = true;

                        exposeMonoCamera = false;

                        break;

                    }

                }