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

Commit eb1aa3d9 authored by Winson Chung's avatar Winson Chung
Browse files

Extending SysUI proto dump to WMShell 

Bug: 161980310
Test: adb shell cmd statusbar tracing start/stop
      adb pull /data/user_de/0/com.android.systemui/files/sysui_trace.pb

Change-Id: Ie99eac753905ee9938a84571943c85b0a2ad29ee
parent c95b7530

libs/WindowManager/Shell/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -83,6 +83,16 @@ genrule { 
}

// End ProtoLog



java_library {

    name: "WindowManager-Shell-proto",



    srcs: ["proto/*.proto"],



    proto: {

        type: "nano",

    },

}



android_library {

    name: "WindowManager-Shell",

    srcs: [
@@ -94,6 +104,7 @@ android_library { 
    ],

    static_libs: [

        "protolog-lib",

        "WindowManager-Shell-proto",

    ],

    manifest: "AndroidManifest.xml",

}
 
 No newline at end of file

libs/WindowManager/Shell/proto/wm_shell_trace.proto

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

 * Copyright (C) 2020 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.

 */



syntax = "proto2";



package com.android.wm.shell;



option java_multiple_files = true;



message WmShellTraceProto {



    // Not used, just a test value

    optional bool test_value = 1;

}

packages/SystemUI/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ java_library { 
    proto: {

        type: "nano",

    },



    libs: [

        "WindowManager-Shell-proto",

    ],

}



java_library {

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
            }

        }



        Dependency.get(ProtoTracer.class).update();

        Dependency.get(ProtoTracer.class).scheduleFrameUpdate();

    }



    private void updateDisabledForQuickstep() {

packages/SystemUI/src/com/android/systemui/tracing/sysui_trace.proto

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


syntax = "proto2";



import "frameworks/base/libs/WindowManager/Shell/proto/wm_shell_trace.proto";



package com.android.systemui.tracing;



option java_multiple_files = true;
@@ -23,6 +25,7 @@ option java_multiple_files = true; 
message SystemUiTraceProto {



    optional EdgeBackGestureHandlerProto edge_back_gesture_handler = 1;

    optional com.android.wm.shell.WmShellTraceProto wm_shell = 2;

}



message EdgeBackGestureHandlerProto {