From d405e90fe0e70eadb0fd8925bf02047026f93c00 Mon Sep 17 00:00:00 2001
From: Dominik Baronelli <dbaronelli@shiftphones.com>
Date: Tue, 16 May 2023 07:34:08 +0200
Subject: [PATCH] Revert "camera: Allow extending aux list/excludelist via sdk
resources"
This reverts commit 18a47660796f07c78ceaa03a1c76db4634493776.
Change-Id: Ic3c2aed96ad810209a30220bbd76c200e4be60d4
---
core/java/android/hardware/Camera.java | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 12759b6a7287..f5de97d698be 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -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 lmodroid resources
- Resources res = ActivityThread.currentApplication().getResources();
- packageList.addAll(Arrays.asList(res.getStringArray(
- com.android.internal.R.array.config_cameraAuxPackageAllowList)));
- packageExcludelist.addAll(Arrays.asList(res.getStringArray(
- com.android.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);
}
/**
--
GitLab