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

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

Merge "Replace use_context_attribution_source /... 

Merge "Replace use_context_attribution_source / check_full_attribution_source_chain flags with read-only flag" into main
parents d3fe479d be9c148b

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

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

                contextAttributionSource.asState();



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

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

            return contextAttributionSourceState;

        } else {

            AttributionSourceState clientAttribution =

core/jni/android_hardware_Camera.cpp

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

    }



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

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

        clientAttribution.uid = Camera::USE_CALLING_UID;

        clientAttribution.pid = Camera::USE_CALLING_PID;

    }