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

Commit 88897567 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge changes I92fca312,I63152fc8,Ia65fb0c2 

am: b2719c5f

Change-Id: I10052283f8f962d086c820a6481326041e04327a
parents 6687474d b2719c5f

PREUPLOAD.cfg

+14 −0
Original line number Diff line number Diff line 
[Builtin Hooks]

clang_format = true



[Builtin Hooks Options]

# Only turn on clang-format check for the following subfolders.

clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp

               libs/binder/ndk/

               libs/graphicsenv/

               libs/gui/

               libs/ui/

               libs/vr/

               services/surfaceflinger/

               services/vr/



[Hook Scripts]

owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"

installd_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "^cmds/installd/"

libs/binder/ndk/include_ndk/android/binder_auto_utils.h

+1 −3
Original line number Diff line number Diff line
@@ -163,9 +163,7 @@ class ScopedAResource { 
    ScopedAResource& operator=(ScopedAResource&&) = delete;



    // move-constructing is okay

    ScopedAResource(ScopedAResource&& other) : mT(std::move(other.mT)) {

      other.mT = DEFAULT;

    }

    ScopedAResource(ScopedAResource&& other) : mT(std::move(other.mT)) { other.mT = DEFAULT; }



   private:

    T mT;