Camera: Simplify code for Aux/Mono white and black lists (39e11299) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+8 −18

Original line number	Diff line number	Diff line
		@@ -296,27 +296,17 @@ public class Camera {
		/* Force to expose only two cameras
		* if the package name does not falls in this bucket
		*/
		String packageList = SystemProperties.get("vendor.camera.aux.packagelist");
		String packageBlacklist = SystemProperties.get("vendor.camera.aux.packageblacklist");
		if (packageList.length() > 0) {
		TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
		splitter.setString(packageList);
		String packageList = SystemProperties.get("vendor.camera.aux.packagelist", "");
		String packageBlacklist = SystemProperties.get("vendor.camera.aux.packageblacklist", "");
		if (!packageList.isEmpty()) {
		exposeAuxCamera = false;
		for (String str : splitter) {
		if (packageName.equals(str)) {
		if (Arrays.asList(packageList.split(",")).contains(packageName)) {
		exposeAuxCamera = true;
		break;
		}
		}
		} else if (packageBlacklist.length() > 0) {
		TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
		splitter.setString(packageBlacklist);
		} else if (!packageBlacklist.isEmpty()) {
		exposeAuxCamera = true;
		for (String str : splitter) {
		if (packageName.equals(str)) {
		if (Arrays.asList(packageBlacklist.split(",")).contains(packageName)) {
		exposeAuxCamera = false;
		break;
		}
		}
		}
		int numberOfCameras = _getNumberOfCameras();

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

+16 −36

Original line number	Diff line number	Diff line
		@@ -915,27 +915,17 @@ public final class CameraManager {

		boolean exposeAuxCamera = true;
		String packageName = ActivityThread.currentOpPackageName();
		String packageList = SystemProperties.get("vendor.camera.aux.packagelist");
		String packageBlacklist = SystemProperties.get("vendor.camera.aux.packageblacklist");
		if (packageList.length() > 0) {
		TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
		splitter.setString(packageList);
		String packageList = SystemProperties.get("vendor.camera.aux.packagelist", "");
		String packageBlacklist = SystemProperties.get("vendor.camera.aux.packageblacklist", "");
		if (!packageList.isEmpty()) {
		exposeAuxCamera = false;
		for (String str : splitter) {
		if (packageName.equals(str)) {
		if (Arrays.asList(packageList.split(",")).contains(packageName)) {
		exposeAuxCamera = true;
		break;
		}
		}
		} else if (packageBlacklist.length() > 0) {
		TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
		splitter.setString(packageBlacklist);
		} else if (!packageBlacklist.isEmpty()) {
		exposeAuxCamera = true;
		for (String str : splitter) {
		if (packageName.equals(str)) {
		if (Arrays.asList(packageBlacklist.split(",")).contains(packageName)) {
		exposeAuxCamera = false;
		break;
		}
		}
		}
		int idCount = 0;
		@@ -1136,27 +1126,17 @@ public final class CameraManager {
		*/
		boolean exposeMonoCamera = true;
		String packageName = ActivityThread.currentOpPackageName();
		String packageList = SystemProperties.get("vendor.camera.aux.packagelist");
		String packageBlacklist = SystemProperties.get("vendor.camera.aux.packageblacklist");
		if (packageList.length() > 0) {
		TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
		splitter.setString(packageList);
		String packageList = SystemProperties.get("vendor.camera.aux.packagelist", "");
		String packageBlacklist = SystemProperties.get("vendor.camera.aux.packageblacklist", "");
		if (!packageList.isEmpty()) {
		exposeMonoCamera = false;
		for (String str : splitter) {
		if (packageName.equals(str)) {
		if (Arrays.asList(packageList.split(",")).contains(packageName)) {
		exposeMonoCamera = true;
		break;
		}
		}
		} else if (packageBlacklist.length() > 0) {
		TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
		splitter.setString(packageBlacklist);
		} else if (!packageBlacklist.isEmpty()) {
		exposeMonoCamera = true;
		for (String str : splitter) {
		if (packageName.equals(str)) {
		if (Arrays.asList(packageBlacklist.split(",")).contains(packageName)) {
		exposeMonoCamera = false;
		break;
		}
		}
		}