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

Unverified Commit 44d74203 authored by Dominik Baronelli's avatar Dominik Baronelli Committed by Michael Bestas
Browse files

Revert "camera: Allow extending aux list/excludelist via sdk resources" 

This reverts commit 8ca9887b.

Change-Id: Ic3c2aed96ad810209a30220bbd76c200e4be60d4
parent ab575b34

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -427,7 +427,6 @@ java_defaults { 
        "audiopolicy-aidl-java",

        "sounddose-aidl-java",

        "modules-utils-expresslog",

        "org.lineageos.platform.resources"

    ],

}

core/java/android/hardware/Camera.java

+6 −15
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.app.ActivityThread; 
import android.app.AppOpsManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Resources;

import android.graphics.ImageFormat;

import android.graphics.Point;

import android.graphics.Rect;
@@ -270,20 +269,12 @@ public class Camera { 
        String packageName = ActivityThread.currentOpPackageName();

        if (packageName == null)

            return true;

        List<String> packageList = new ArrayList<>(Arrays.asList(

                SystemProperties.get("vendor.camera.aux.packagelist", ",").split(",")));

        List<String> packageExcludelist = new ArrayList<>(Arrays.asList(

                SystemProperties.get("vendor.camera.aux.packageexcludelist", ",").split(",")));



        // Append packages from lineage-sdk resources

        Resources res = ActivityThread.currentApplication().getResources();

        packageList.addAll(Arrays.asList(res.getStringArray(

                org.lineageos.platform.internal.R.array.config_cameraAuxPackageAllowList)));

        packageExcludelist.addAll(Arrays.asList(res.getStringArray(

                org.lineageos.platform.internal.R.array.config_cameraAuxPackageExcludeList)));



        return (packageList.isEmpty() || packageList.contains(packageName)) &&

                !packageExcludelist.contains(packageName);

        List<String> packageList = Arrays.asList(

                SystemProperties.get("vendor.camera.aux.packagelist", packageName).split(","));

        List<String> packageExcludelist = Arrays.asList(

                SystemProperties.get("vendor.camera.aux.packageexcludelist", "").split(","));



        return packageList.contains(packageName) && !packageExcludelist.contains(packageName);

    }



    /**