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

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

fixup! camera: Skip HFR checks for privileged apps.

Change-Id: If95dde5851b418ea69575d71d06d5006b9aae397
parent 44d74203
Loading
Loading
Loading
Loading
+17 −15
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.internal.util.Preconditions.checkNotNull;

import android.app.ActivityThread;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.graphics.ImageFormat;
import android.graphics.PixelFormat;
import android.hardware.HardwareBuffer;
@@ -33,7 +32,6 @@ import android.util.Range;
import android.util.Size;
import android.view.Surface;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -303,19 +301,6 @@ public class SurfaceUtils {
        }
    }

    private static boolean isPrivilegedApp() {
        String packageName = ActivityThread.currentOpPackageName();
        List<String> packageList = new ArrayList<>(Arrays.asList(
                SystemProperties.get("persist.vendor.camera.privapp.list", ",").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_cameraHFRPrivAppList)));

        return packageList.contains(packageName);
    }

    private static native int nativeDetectSurfaceType(Surface surface);

    private static native int nativeDetectSurfaceDataspace(Surface surface);
@@ -326,4 +311,21 @@ public class SurfaceUtils {
            /*out*/int[/*2*/] dimens);

    private static native long nativeGetSurfaceId(Surface surface);

    private static boolean isPrivilegedApp() {
        String packageName = ActivityThread.currentOpPackageName();
        String packageList = SystemProperties.get("persist.vendor.camera.privapp.list");

        if (packageList.length() > 0) {
            TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
            splitter.setString(packageList);
            for (String str : splitter) {
                if (packageName.equals(str)) {
                    return true;
                }
            }
        }

        return false;
    }
}