diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 12759b6a7287d76ec45c6619785d43b6342ab517..f5de97d698be8bb0986b9f85c1013223184881fe 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); } /**