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

Commit cdb6b16d authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android R"

parents 171cac1b ac07d0f5

.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*.pyc

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ clang_format = true 
clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp

               cmds/idlcli/

               include/input/

               libs/binder/fuzzer/

               libs/binder/ndk/

               libs/binderthreadstate/

               libs/graphicsenv/

aidl/gui/android/view/LayerMetadataKey.aidl

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.view;



/** @hide */

@Backing(type="int")

enum LayerMetadataKey {

    METADATA_OWNER_UID = 1,

    METADATA_WINDOW_TYPE = 2,

    METADATA_TASK_ID = 3,

    METADATA_MOUSE_CURSOR = 4,

}

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/task/task_rename/enable

    chmod 0666 /sys/kernel/debug/tracing/events/task/task_newtask/enable

    chmod 0666 /sys/kernel/tracing/events/task/task_newtask/enable

    chmod 0666 /sys/kernel/debug/tracing/events/gpu_mem/gpu_mem_total/enable

    chmod 0666 /sys/kernel/tracing/events/gpu_mem/gpu_mem_total/enable



    # disk

    chmod 0666 /sys/kernel/tracing/events/f2fs/f2fs_get_data_block/enable

cmds/dumpstate/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ filegroup { 
    name: "dumpstate_aidl",

    srcs: [

        "binder/android/os/IDumpstateListener.aidl",

        "binder/android/os/IDumpstateToken.aidl",

        "binder/android/os/IDumpstate.aidl",

    ],

    path: "binder",
@@ -77,6 +76,7 @@ cc_defaults { 
    defaults: ["dumpstate_cflag_defaults"],

    shared_libs: [

        "android.hardware.dumpstate@1.0",

        "android.hardware.dumpstate@1.1",

        "libziparchive",

        "libbase",

        "libbinder",