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

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

Snap for 5999026 from e00dd195 to rvc-release 

Change-Id: I8b31b8baa8a407c7911af7d2d959d724ec41f5dc
parents 4e9fcbba e00dd195

cmds/installd/migrate_legacy_obb_data.sh

+5 −5
Original line number Diff line number Diff line
@@ -15,17 +15,17 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



rm -rf /sdcard/Android/obb/test_probe

mkdir -p /sdcard/Android/obb/

touch /sdcard/Android/obb/test_probe

rm -rf /data/media/Android/obb/test_probe

mkdir -p /data/media/Android/obb/

touch /data/media/Android/obb/test_probe

if ! test -f /data/media/0/Android/obb/test_probe ; then

  log -p i -t migrate_legacy_obb_data "No support for 'unshared_obb'. Not migrating"

  rm -rf /sdcard/Android/obb/test_probe

  rm -rf /data/media/Android/obb/test_probe

  exit 0

fi



# Delete the test file, and remove the obb folder if it is empty

rm -rf /sdcard/Android/obb/test_probe

rm -rf /data/media/Android/obb/test_probe

rmdir /data/media/obb



if ! test -d /data/media/obb ; then

libs/arect/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -13,13 +13,18 @@ 
// limitations under the License.



ndk_headers {

    name: "libarect_headers",

    name: "libarect_headers_for_ndk",

    from: "include/android",

    to: "android",

    srcs: ["include/android/*.h"],

    license: "NOTICE",

}



cc_library_headers {

    name: "libarect_headers",

    export_include_dirs: ["include"],

}



cc_library_static {

    name: "libarect",

    host_supported: true,

libs/binder/include/binder/ParcelFileDescriptor.h

+18 −0
Original line number Diff line number Diff line
@@ -42,6 +42,24 @@ public: 
    android::status_t writeToParcel(android::Parcel* parcel) const override;

    android::status_t readFromParcel(const android::Parcel* parcel) override;



    inline bool operator!=(const ParcelFileDescriptor& rhs) const {

        return mFd != rhs.mFd;

    }

    inline bool operator<(const ParcelFileDescriptor& rhs) const {

        return mFd < rhs.mFd;

    }

    inline bool operator<=(const ParcelFileDescriptor& rhs) const {

        return mFd <= rhs.mFd;

    }

    inline bool operator==(const ParcelFileDescriptor& rhs) const {

        return mFd == rhs.mFd;

    }

    inline bool operator>(const ParcelFileDescriptor& rhs) const {

        return mFd > rhs.mFd;

    }

    inline bool operator>=(const ParcelFileDescriptor& rhs) const {

        return mFd >= rhs.mFd;

    }

private:

    android::base::unique_fd mFd;

};

libs/binder/tests/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -119,12 +119,7 @@ cc_test { 
    srcs: ["binderSafeInterfaceTest.cpp"],



    cppflags: [

        "-Weverything",

        "-Wno-c++98-compat",

        "-Wno-c++98-compat-pedantic",

        "-Wno-global-constructors",

        "-Wno-padded",

        "-Wno-weak-vtables",

        "-Wextra",

    ],



    cpp_std: "experimental",

libs/gui/BLASTBufferQueue.cpp

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ BLASTBufferQueue::BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, 
    mBufferItemConsumer->setBufferFreedListener(this);

    mBufferItemConsumer->setDefaultBufferSize(mWidth, mHeight);

    mBufferItemConsumer->setDefaultBufferFormat(PIXEL_FORMAT_RGBA_8888);

    mBufferItemConsumer->setTransformHint(mSurfaceControl->getTransformHint());

}



void BLASTBufferQueue::update(const sp<SurfaceControl>& surface, int width, int height) {
@@ -41,6 +42,7 @@ void BLASTBufferQueue::update(const sp<SurfaceControl>& surface, int width, int 
    mWidth = width;

    mHeight = height;

    mBufferItemConsumer->setDefaultBufferSize(mWidth, mHeight);

    mBufferItemConsumer->setTransformHint(mSurfaceControl->getTransformHint());

}



static void transactionCallbackThunk(void* context, nsecs_t latchTime,
@@ -63,6 +65,7 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
                                                   ? stats[0].previousReleaseFence

                                                   : Fence::NO_FENCE);

        mNextCallbackBufferItem = BufferItem();

        mBufferItemConsumer->setTransformHint(stats[0].transformHint);

    }

    mDequeueWaitCV.notify_all();

    decStrong((void*)transactionCallbackThunk);