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

Commit 5927619e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10844961 from a9730092 to 24Q1-release 

Change-Id: I349ed8fc407b0ae734feba51bd3f2d176c0864d2
parents e18dde9c a9730092

core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ public class SystemUiSystemPropertiesFlags { 


        public static final Flag PROPAGATE_CHANNEL_UPDATES_TO_CONVERSATIONS = releasedFlag(

                "persist.sysui.notification.propagate_channel_updates_to_conversations");



        /** b/301242692: Visit extra URIs used in notifications to prevent security issues. */

        public static final Flag VISIT_RISKY_URIS = devFlag(

                "persist.sysui.notification.visit_risky_uris");

    }



    //// == End of flags.  Everything below this line is the implementation. == ////

core/res/res/xml/sms_short_codes.xml

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,9 @@ 
    <!-- Pakistan -->

    <shortcode country="pk" pattern="\\d{1,5}" free="2057" />



    <!-- Palestine: 5 digits, known premium codes listed -->

    <shortcode country="ps" pattern="\\d{1,5}" free="37477" />



    <!-- Poland: 4-5 digits (not confirmed), known premium codes listed, plus EU -->

    <shortcode country="pl" pattern="\\d{4,5}" premium="74240|79(?:10|866)|92525" free="116\\d{3}|8012|80921" />

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipFromSplitScreenOnGoToHomeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : 
            if (flicker.scenario.isLandscapeOrSeascapeAtStart) {

                flicker.assertWmVisibleRegion(pipApp) {

                    // first check against landscape bounds then against portrait bounds

                    (coversAtMost(displayBounds).then() as RegionTraceSubject).coversAtMost(

                    coversAtMost(displayBounds).then().coversAtMost(

                        portraitDisplayBounds

                    )

                }

libs/hwui/renderthread/CanvasContext.cpp

+7 −6
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ CanvasContext::CanvasContext(RenderThread& thread, bool translucent, RenderNode* 
        , mProfiler(mJankTracker.frames(), thread.timeLord().frameIntervalNanos())

        , mContentDrawBounds(0, 0, 0, 0)

        , mRenderPipeline(std::move(renderPipeline))

        , mHintSessionWrapper(uiThreadId, renderThreadId) {

        , mHintSessionWrapper(std::make_shared<HintSessionWrapper>(uiThreadId, renderThreadId)) {

    mRenderThread.cacheManager().registerCanvasContext(this);

    mRenderThread.renderState().registerContextCallback(this);

    rootRenderNode->makeRoot();
@@ -162,6 +162,7 @@ void CanvasContext::destroy() { 
    destroyHardwareResources();

    mAnimationContext->destroy();

    mRenderThread.cacheManager().onContextStopped(this);

    mHintSessionWrapper->delayedDestroy(mRenderThread, 2_s, mHintSessionWrapper);

}



static void setBufferCount(ANativeWindow* window) {
@@ -766,7 +767,7 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) { 
    int64_t frameDeadline = mCurrentFrameInfo->get(FrameInfoIndex::FrameDeadline);

    int64_t dequeueBufferDuration = mCurrentFrameInfo->get(FrameInfoIndex::DequeueBufferDuration);



    mHintSessionWrapper.updateTargetWorkDuration(frameDeadline - intendedVsync);

    mHintSessionWrapper->updateTargetWorkDuration(frameDeadline - intendedVsync);



    if (didDraw) {

        int64_t frameStartTime = mCurrentFrameInfo->get(FrameInfoIndex::FrameStartTime);
@@ -774,7 +775,7 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) { 
        int64_t actualDuration = frameDuration -

                                 (std::min(syncDelayDuration, mLastDequeueBufferDuration)) -

                                 dequeueBufferDuration - idleDuration;

        mHintSessionWrapper.reportActualWorkDuration(actualDuration);

        mHintSessionWrapper->reportActualWorkDuration(actualDuration);

    }



    mLastDequeueBufferDuration = dequeueBufferDuration;
@@ -1112,11 +1113,11 @@ void CanvasContext::prepareSurfaceControlForWebview() { 
}



void CanvasContext::sendLoadResetHint() {

    mHintSessionWrapper.sendLoadResetHint();

    mHintSessionWrapper->sendLoadResetHint();

}



void CanvasContext::sendLoadIncreaseHint() {

    mHintSessionWrapper.sendLoadIncreaseHint();

    mHintSessionWrapper->sendLoadIncreaseHint();

}



void CanvasContext::setSyncDelayDuration(nsecs_t duration) {
@@ -1124,7 +1125,7 @@ void CanvasContext::setSyncDelayDuration(nsecs_t duration) { 
}



void CanvasContext::startHintSession() {

    mHintSessionWrapper.init();

    mHintSessionWrapper->init();

}



bool CanvasContext::shouldDither() {

libs/hwui/renderthread/CanvasContext.h

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ private: 
    std::function<bool(int64_t, int64_t, int64_t)> mASurfaceTransactionCallback;

    std::function<void()> mPrepareSurfaceControlForWebviewCallback;



    HintSessionWrapper mHintSessionWrapper;

    std::shared_ptr<HintSessionWrapper> mHintSessionWrapper;

    nsecs_t mLastDequeueBufferDuration = 0;

    nsecs_t mSyncDelayDuration = 0;

    nsecs_t mIdleDuration = 0;