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

Commit 08407e38 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4447680 from de1eb9c0 to pi-release 

Change-Id: I4ee5c62fe9894f4dab99bbdf58308257699a585e
parents 46e48bc7 de1eb9c0

cmds/dumpstate/dumpstate.cpp

+0 −3
Original line number Diff line number Diff line
@@ -1184,9 +1184,6 @@ static void dumpstate() { 


    RunCommand("SYSTEM PROPERTIES", {"getprop"});



    RunCommand("VOLD DUMP", {"vdc", "dump"});

    RunCommand("SECURE CONTAINERS", {"vdc", "asec", "list"});



    RunCommand("STORAGED IO INFO", {"storaged", "-u", "-p"});



    RunCommand("FILESYSTEMS & FREE SPACE", {"df"});

libs/sensor/ISensorServer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public: 
        Vector<Sensor> v;

        uint32_t n = reply.readUint32();

        v.setCapacity(n);

        while (n--) {

        while (n) {

            n--;

            reply.read(s);

            v.add(s);

        }
@@ -80,7 +81,8 @@ public: 
        Vector<Sensor> v;

        uint32_t n = reply.readUint32();

        v.setCapacity(n);

        while (n--) {

        while (n) {

            n--;

            reply.read(s);

            v.add(s);

        }

services/sensorservice/tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES:= \

	sensorservicetest.cpp



LOCAL_CFLAGS := -Wall -Werror



LOCAL_SHARED_LIBRARIES := \

	libutils libsensor libandroid

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ BufferLayer::BufferLayer(SurfaceFlinger* flinger, const sp<Client>& client, cons 
                         uint32_t w, uint32_t h, uint32_t flags)

      : Layer(flinger, client, name, w, h, flags),

        mSurfaceFlingerConsumer(nullptr),

        mTextureName(-1U),

        mTextureName(UINT32_MAX),

        mFormat(PIXEL_FORMAT_NONE),

        mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),

        mBufferLatched(false),

services/surfaceflinger/EventThread.cpp

+3 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ Vector< sp<EventThread::Connection> > EventThread::waitForEvent( 


        // find out connections waiting for events

        size_t count = mDisplayEventConnections.size();

        for (size_t i=0 ; i<count ; i++) {

        for (size_t i=0 ; i<count ; ) {

            sp<Connection> connection(mDisplayEventConnections[i].promote());

            if (connection != NULL) {

                bool added = false;
@@ -279,11 +279,12 @@ Vector< sp<EventThread::Connection> > EventThread::waitForEvent( 
                    // messages.

                    signalConnections.add(connection);

                }

                ++i;

            } else {

                // we couldn't promote this reference, the connection has

                // died, so clean-up!

                mDisplayEventConnections.removeAt(i);

                --i; --count;

                --count;

            }

        }