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

Commit 12cfefe5 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "Remove data_delivery_permission_checks flag." into main

parents 8007ae53 3e0c8e90

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

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ public final class CameraManager { 
        AttributionSourceState contextAttributionSourceState =

                contextAttributionSource.asState();



        if (Flags.dataDeliveryPermissionChecks() && useContextAttributionSource) {

        if (useContextAttributionSource) {

            return contextAttributionSourceState;

        } else {

            AttributionSourceState clientAttribution =

core/jni/android_hardware_Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static bool attributionSourceStateForJavaParcel(JNIEnv *env, jobject jClientAttr 
        return false;

    }



    if (!(useContextAttributionSource && flags::data_delivery_permission_checks())) {

    if (!useContextAttributionSource) {

        clientAttribution.uid = Camera::USE_CALLING_UID;

        clientAttribution.pid = Camera::USE_CALLING_PID;

    }