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

Commit 55432784 authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

Merge "Do not remove type string for old builds" into main

parents 710e73fe 947f606f

core/java/android/view/InsetsSource.java

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view;



import static android.view.InsetsSourceProto.FRAME;

import static android.view.InsetsSourceProto.TYPE;

import static android.view.InsetsSourceProto.TYPE_NUMBER;

import static android.view.InsetsSourceProto.VISIBLE;

import static android.view.InsetsSourceProto.VISIBLE_FRAME;
@@ -442,6 +443,10 @@ public class InsetsSource implements Parcelable { 
     */

    public void dumpDebug(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);

        if (!android.os.Flags.androidOsBuildVanillaIceCream()) {

            // Deprecated since V.

            proto.write(TYPE, WindowInsets.Type.toString(mType));

        }

        mFrame.dumpDebug(proto, FRAME);

        if (mVisibleFrame != null) {

            mVisibleFrame.dumpDebug(proto, VISIBLE_FRAME);