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

Commit 1a01c40d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6192959 from 7340afce to rvc-release 

Change-Id: Ice8a92856aa93249417d6fbc2732a565351361fd
parents 4730e93c 7340afce

cmds/installd/dexopt.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1271,11 +1271,6 @@ class Dex2oatFileWrapper { 
Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path,

        bool generate_app_image, bool is_public, int uid, bool is_secondary_dex) {



    // We don't create an image for secondary dex files.

    if (is_secondary_dex) {

        return Dex2oatFileWrapper();

    }



    const std::string image_path = create_image_filename(out_oat_path);

    if (image_path.empty()) {

        // Happens when the out_oat_path has an unknown extension.

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+5 −1
Original line number Diff line number Diff line
@@ -761,7 +761,11 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { 
        (mDeviceMode == DEVICE_MODE_DIRECT && mConfig.showTouches)) {

        if (mPointerController == nullptr || viewportChanged) {

            mPointerController = getPolicy()->obtainPointerController(getDeviceId());

            mPointerController->setDisplayViewport(mViewport);

            // Set the DisplayViewport for the PointerController to the default pointer display

            // that is recommended by the configuration before using it.

            std::optional<DisplayViewport> defaultViewport =

                    mConfig.getDisplayViewportById(mConfig.defaultPointerDisplayId);

            mPointerController->setDisplayViewport(defaultViewport.value_or(mViewport));

        }

    } else {

        mPointerController.clear();

services/sensorservice/SensorService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -520,6 +520,10 @@ status_t SensorService::dump(int fd, const Vector<String16>& args) { 
status_t SensorService::dumpProtoLocked(int fd, ConnectionSafeAutolock* connLock) const {

    using namespace service::SensorServiceProto;

    util::ProtoOutputStream proto;

    proto.write(INIT_STATUS, int(SensorDevice::getInstance().initCheck()));

    if (!mSensors.hasAnySensor()) {

        return proto.flush(fd) ? OK : UNKNOWN_ERROR;

    }

    const bool privileged = IPCThreadState::self()->getCallingUid() == 0;



    timespec curTime;

services/surfaceflinger/BufferQueueLayer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) { 
            status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));

            if (result != NO_ERROR) {

                ALOGE("[%s] Timed out waiting on callback", getDebugName());

                break;

            }

        }
@@ -469,6 +470,7 @@ void BufferQueueLayer::onFrameReplaced(const BufferItem& item) { 
            status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));

            if (result != NO_ERROR) {

                ALOGE("[%s] Timed out waiting on callback", getDebugName());

                break;

            }

        }