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

Commit 51e6483b authored by Galia Peycheva's avatar Galia Peycheva
Browse files

Revert "Add permission check for blurs in SurfaceFlinger" 

Revert "Remove public usages of FLAG_BLUR_BEHIND"

Revert "Add pid and uid to SF::setClientStateLocked"

Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"

Revert submission 13350963-blur_system_api

Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.

Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi

Bug: 177523043
Test: m
Change-Id: I4645b0483df69f4e5e970835fb3a232eb89c8f06
parent a01d420d

services/surfaceflinger/SurfaceFlinger.cpp

+4 −15
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ const String16 sHardwareTest("android.permission.HARDWARE_TEST"); 
const String16 sAccessSurfaceFlinger("android.permission.ACCESS_SURFACE_FLINGER");

const String16 sRotateSurfaceFlinger("android.permission.ROTATE_SURFACE_FLINGER");

const String16 sReadFramebuffer("android.permission.READ_FRAME_BUFFER");

const String16 sUseBackgroundBlur("android.permission.USE_BACKGROUND_BLUR");

const String16 sDump("android.permission.DUMP");

const char* KERNEL_IDLE_TIMER_PROP = "graphics.display.kernel_idle_timer.enabled";
@@ -333,10 +332,6 @@ bool callingThreadHasRotateSurfaceFlingerAccess() { 
            PermissionCache::checkPermission(sRotateSurfaceFlinger, pid, uid);

}



bool originalCallerCanUseBlurs(int originPid, int originUid) {

    return PermissionCache::checkPermission(sUseBackgroundBlur, originPid, originUid);

}



SurfaceFlingerBE::SurfaceFlingerBE() : mHwcServiceName(getHwcServiceName()) {}



SurfaceFlinger::SurfaceFlinger(Factory& factory, SkipInitializationTag)
@@ -3486,8 +3481,7 @@ void SurfaceFlinger::applyTransactionState( 
    for (const ComposerState& state : states) {

        clientStateFlags |=

                setClientStateLocked(frameTimelineInfo, state, desiredPresentTime, isAutoTimestamp,

                                     postTime, privileged, listenerCallbacksWithSurfaces, originPid,

                                     originUid);

                                     postTime, privileged, listenerCallbacksWithSurfaces);

        if ((flags & eAnimation) && state.state.surface) {

            if (const auto layer = fromHandleLocked(state.state.surface).promote(); layer) {

                mScheduler->recordLayerHistory(layer.get(),
@@ -3667,8 +3661,7 @@ bool SurfaceFlinger::callingThreadHasUnscopedSurfaceFlingerAccess(bool usePermis 
uint32_t SurfaceFlinger::setClientStateLocked(

        const FrameTimelineInfo& frameTimelineInfo, const ComposerState& composerState,

        int64_t desiredPresentTime, bool isAutoTimestamp, int64_t postTime, bool privileged,

        std::unordered_set<ListenerCallbacks, ListenerCallbacksHash>& listenerCallbacks,

        int originPid, int originUid) {

        std::unordered_set<ListenerCallbacks, ListenerCallbacksHash>& listenerCallbacks) {

    const layer_state_t& s = composerState.state;



    for (auto& listener : s.listeners) {
@@ -3814,14 +3807,10 @@ uint32_t SurfaceFlinger::setClientStateLocked( 
        if (layer->setCornerRadius(s.cornerRadius))

            flags |= eTraversalNeeded;

    }



    if (what & layer_state_t::eBackgroundBlurRadiusChanged && !mDisableBlurs && mSupportsBlur &&

        originalCallerCanUseBlurs(originPid, originUid)) {

    if (what & layer_state_t::eBackgroundBlurRadiusChanged && !mDisableBlurs && mSupportsBlur) {

        if (layer->setBackgroundBlurRadius(s.backgroundBlurRadius)) flags |= eTraversalNeeded;

    }



    if (what & layer_state_t::eBlurRegionsChanged &&

        originalCallerCanUseBlurs(originPid, originUid)) {

    if (what & layer_state_t::eBlurRegionsChanged) {

        if (layer->setBlurRegions(s.blurRegions)) flags |= eTraversalNeeded;

    }

    if (what & layer_state_t::eLayerStackChanged) {

services/surfaceflinger/SurfaceFlinger.h

+2 −2
Original line number Diff line number Diff line
@@ -345,8 +345,8 @@ protected: 
    virtual uint32_t setClientStateLocked(

            const FrameTimelineInfo& info, const ComposerState& composerState,

            int64_t desiredPresentTime, bool isAutoTimestamp, int64_t postTime, bool privileged,

            std::unordered_set<ListenerCallbacks, ListenerCallbacksHash>& listenerCallbacks,

            int originPid, int originUid) REQUIRES(mStateLock);

            std::unordered_set<ListenerCallbacks, ListenerCallbacksHash>& listenerCallbacks)

            REQUIRES(mStateLock);

    virtual void commitTransactionLocked();



    // Used internally by computeLayerBounds() to gets the clip rectangle to use for the