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

Commit af03df6a authored by Steven Timotius's avatar Steven Timotius
Browse files

Update WindowManager to output dumpsys in protobuf format 

Implement enough functionality in protobuf dumpsys to replicate
old functionaltiy in android.server.cts.WindowManagerState

Test: cts-tradefed run commandAndExit cts-dev --module CtsWindowManagerHostTestCases
cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases
Change-Id: Ib527ab3f44620a08cf03b77c37c2bae883d90e13
parent 211ec527

core/java/android/view/DisplayInfo.java

+22 −0
Original line number Diff line number Diff line
@@ -16,12 +16,18 @@ 


package android.view;



import static android.view.DisplayInfoProto.APP_HEIGHT;

import static android.view.DisplayInfoProto.APP_WIDTH;

import static android.view.DisplayInfoProto.LOGICAL_HEIGHT;

import static android.view.DisplayInfoProto.LOGICAL_WIDTH;



import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.proto.ProtoOutputStream;



import libcore.util.Objects;
@@ -654,6 +660,22 @@ public final class DisplayInfo implements Parcelable { 
        return sb.toString();

    }



    /**

     * Write to a protocol buffer output stream.

     * Protocol buffer message definition at {@link android.view.DisplayInfoProto}

     *

     * @param protoOutputStream Stream to write the Rect object to.

     * @param fieldId           Field Id of the DisplayInfoProto as defined in the parent message

     */

    public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) {

        final long token = protoOutputStream.start(fieldId);

        protoOutputStream.write(LOGICAL_WIDTH, logicalWidth);

        protoOutputStream.write(LOGICAL_HEIGHT, logicalHeight);

        protoOutputStream.write(APP_WIDTH, appWidth);

        protoOutputStream.write(APP_HEIGHT, appHeight);

        protoOutputStream.end(token);

    }



    private static String flagsToString(int flags) {

        StringBuilder result = new StringBuilder();

        if ((flags & Display.FLAG_SECURE) != 0) {

core/java/android/view/IApplicationToken.aidl

+1 −0
Original line number Diff line number Diff line
@@ -20,5 +20,6 @@ package android.view; 
/** {@hide} */

interface IApplicationToken

{

  String getName();

}

core/java/android/view/WindowManager.java

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.text.TextUtils;

import android.util.Log;

import android.util.proto.ProtoOutputStream;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -2544,6 +2545,15 @@ public interface WindowManager extends ViewManager { 
            return sb.toString();

        }



        /**

         * @hide

         */

        public void writeToProto(ProtoOutputStream proto, long fieldId) {

            final long token = proto.start(fieldId);

            proto.write(WindowLayoutParamsProto.TYPE, type);

            proto.end(token);

        }



        /**

         * Scale the layout params' coordinates and size.

         * @hide

core/java/android/view/WindowManagerPolicy.java

+9 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.RemoteException;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.animation.Animation;



import com.android.internal.policy.IKeyguardDismissCallback;
@@ -1645,6 +1646,14 @@ public interface WindowManagerPolicy { 
     */

    public void dump(String prefix, PrintWriter writer, String[] args);



    /**

     * Write the WindowManagerPolicy's state into the protocol buffer.

     * The message is described in {@link com.android.server.wm.proto.WindowManagerPolicyProto}

     *

     * @param proto The protocol buffer output stream to write to.

     */

    void writeToProto(ProtoOutputStream proto, long fieldId);



    /**

     * Returns whether a given window type can be magnified.

     *

core/proto/android/graphics/rect.proto

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

 * Copyright (C) 2017 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 = "proto3";



package android.graphics;



option java_multiple_files = true;



message RectProto {

  int32 left = 1;

  int32 top = 2;

  int32 right = 3;

  int32 bottom = 4;

}