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

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

Snap for 11265615 from 6f1c2fc7 to 24Q2-release 

Change-Id: Ia6bb0951cb1b72a8f267060ba8701d73b564113c
parents 6057ae88 6f1c2fc7

libs/fakeservicemanager/FakeServiceManager.cpp

+13 −3
Original line number Diff line number Diff line
@@ -122,10 +122,20 @@ std::vector<IServiceManager::ServiceDebugInfo> FakeServiceManager::getServiceDeb 
}



void FakeServiceManager::clear() {

    std::lock_guard<std::mutex> l(mMutex);

    std::map<String16, sp<IBinder>> backup;



    {

      std::lock_guard<std::mutex> l(mMutex);

      backup = mNameToService;

      mNameToService.clear();

    }



    // destructors may access FSM, so avoid recursive lock

    backup.clear(); // explicit



    // TODO: destructors may have added more services here - may want

    // to check this or abort

}

}  // namespace android



[[clang::no_destroy]] static sp<FakeServiceManager> gFakeServiceManager;

libs/gui/Choreographer.cpp

+5 −2
Original line number Diff line number Diff line
@@ -344,8 +344,11 @@ void Choreographer::dispatchNullEvent(nsecs_t, PhysicalDisplayId) { 
    handleRefreshRateUpdates();

}



void Choreographer::dispatchHdcpLevelsChanged(PhysicalDisplayId, int32_t, int32_t) {

    LOG_ALWAYS_FATAL("dispatchHdcpLevelsChanged was called but was never registered");

void Choreographer::dispatchHdcpLevelsChanged(PhysicalDisplayId displayId, int32_t connectedLevel,

                                              int32_t maxLevel) {

    ALOGV("choreographer %p ~ received hdcp levels change event (displayId=%s, connectedLevel=%d, "

          "maxLevel=%d), ignoring.",

          this, to_string(displayId).c_str(), connectedLevel, maxLevel);

}



void Choreographer::handleMessage(const Message& message) {

libs/nativewindow/libnativewindow.map.txt

+13 −13
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ LIBNATIVEWINDOW { 
  global:

    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_allocate2; # llndk # systemapi

    AHardwareBuffer_createFromHandle; # llndk # systemapi

    AHardwareBuffer_allocate2; # llndk systemapi

    AHardwareBuffer_createFromHandle; # llndk systemapi

    AHardwareBuffer_describe;

    AHardwareBuffer_getId; # introduced=31

    AHardwareBuffer_getNativeHandle; # llndk # systemapi

    AHardwareBuffer_getNativeHandle; # llndk systemapi

    AHardwareBuffer_isSupported; # introduced=29

    AHardwareBuffer_lock;

    AHardwareBuffer_lockAndGetInfo; # introduced=29
@@ -17,8 +17,8 @@ LIBNATIVEWINDOW { 
    AHardwareBuffer_unlock;

    AHardwareBuffer_readFromParcel; # introduced=34

    AHardwareBuffer_writeToParcel; # introduced=34

    AHardwareBuffer_getDataSpace; # llndk # systemapi

    AHardwareBuffer_setDataSpace; # llndk # systemapi

    AHardwareBuffer_getDataSpace; # llndk systemapi

    AHardwareBuffer_setDataSpace; # llndk systemapi

    ANativeWindowBuffer_getHardwareBuffer; # llndk

    ANativeWindow_OemStorageGet; # llndk

    ANativeWindow_OemStorageSet; # llndk
@@ -29,18 +29,18 @@ LIBNATIVEWINDOW { 
    ANativeWindow_getBuffersDefaultDataSpace; # introduced=34

    ANativeWindow_getFormat;

    ANativeWindow_getHeight;

    ANativeWindow_getLastDequeueDuration; # systemapi # introduced=30

    ANativeWindow_getLastDequeueStartTime; # systemapi # introduced=30

    ANativeWindow_getLastQueueDuration; # systemapi # introduced=30

    ANativeWindow_getLastDequeueDuration; # systemapi introduced=30

    ANativeWindow_getLastDequeueStartTime; # systemapi introduced=30

    ANativeWindow_getLastQueueDuration; # systemapi introduced=30

    ANativeWindow_getWidth;

    ANativeWindow_lock;

    ANativeWindow_query; # llndk

    ANativeWindow_queryf; # llndk

    ANativeWindow_queueBuffer; # llndk

    ANativeWindow_setCancelBufferInterceptor; # systemapi # introduced=30

    ANativeWindow_setDequeueBufferInterceptor; # systemapi # introduced=30

    ANativeWindow_setPerformInterceptor; # systemapi # introduced=30

    ANativeWindow_setQueueBufferInterceptor; # systemapi # introduced=30

    ANativeWindow_setCancelBufferInterceptor; # systemapi introduced=30

    ANativeWindow_setDequeueBufferInterceptor; # systemapi introduced=30

    ANativeWindow_setPerformInterceptor; # systemapi introduced=30

    ANativeWindow_setQueueBufferInterceptor; # systemapi introduced=30

    ANativeWindow_release;

    ANativeWindow_setAutoPrerotation; # llndk

    ANativeWindow_setAutoRefresh; # llndk
@@ -51,7 +51,7 @@ LIBNATIVEWINDOW { 
    ANativeWindow_setBuffersGeometry;

    ANativeWindow_setBuffersTimestamp; # llndk

    ANativeWindow_setBuffersTransform;

    ANativeWindow_setDequeueTimeout; # systemapi # introduced=30

    ANativeWindow_setDequeueTimeout; # systemapi introduced=30

    ANativeWindow_setFrameRate; # introduced=30

    ANativeWindow_setFrameRateWithChangeStrategy; # introduced=31

    ANativeWindow_setSharedBufferMode; # llndk

services/inputflinger/tests/CursorInputMapper_test.cpp

+1026 −9

File changed.

Preview size limit exceeded, changes collapsed.

services/inputflinger/tests/FakePointerController.cpp

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ void FakePointerController::setBounds(float minX, float minY, float maxX, float 
    mMaxY = maxY;

}



void FakePointerController::clearBounds() {

    mHaveBounds = false;

}



const std::map<int32_t, std::vector<int32_t>>& FakePointerController::getSpots() {

    return mSpotsByDisplay;

}