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

Commit 7d17dd71 authored by Yi Jin's avatar Yi Jin Committed by Android (Google) Code Review
Browse files

Merge "Fix privacy tags based on PWG review meeting." into pi-dev

parents c16de056 163967fe

core/java/android/os/Looper.java

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ public final class Looper { 
        final long looperToken = proto.start(fieldId);

        proto.write(LooperProto.THREAD_NAME, mThread.getName());

        proto.write(LooperProto.THREAD_ID, mThread.getId());

        proto.write(LooperProto.IDENTITY_HASH_CODE, System.identityHashCode(this));

        mQueue.writeToProto(proto, LooperProto.QUEUE);

        proto.end(looperToken);

    }

core/java/android/os/PowerManager.java

+5 −5
Original line number Diff line number Diff line
@@ -1643,12 +1643,12 @@ public final class PowerManager { 
        public void writeToProto(ProtoOutputStream proto, long fieldId) {

            synchronized (mToken) {

                final long token = proto.start(fieldId);

                proto.write(PowerManagerProto.WakeLockProto.HEX_STRING,

                        Integer.toHexString(System.identityHashCode(this)));

                proto.write(PowerManagerProto.WakeLockProto.HELD, mHeld);

                proto.write(PowerManagerProto.WakeLockProto.INTERNAL_COUNT, mInternalCount);

                proto.write(PowerManagerProto.WakeLock.TAG, mTag);

                proto.write(PowerManagerProto.WakeLock.PACKAGE_NAME, mPackageName);

                proto.write(PowerManagerProto.WakeLock.HELD, mHeld);

                proto.write(PowerManagerProto.WakeLock.INTERNAL_COUNT, mInternalCount);

                if (mWorkSource != null) {

                    mWorkSource.writeToProto(proto, PowerManagerProto.WakeLockProto.WORK_SOURCE);

                    mWorkSource.writeToProto(proto, PowerManagerProto.WakeLock.WORK_SOURCE);

                }

                proto.end(token);

            }

core/proto/android/content/configuration.proto

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ message ConfigurationProto { 


  optional float font_scale = 1;

  optional uint32 mcc = 2;

  optional uint32 mnc = 3;

  optional uint32 mnc = 3 [ (.android.privacy).dest = DEST_EXPLICIT ];

  repeated LocaleProto locales = 4;

  optional uint32 screen_layout = 5;

  optional uint32 color_mode = 6;

core/proto/android/content/intent.proto

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ message IntentProto { 
    optional ComponentNameProto component = 7;

    optional string source_bounds = 8;

    optional string clip_data = 9 [ (.android.privacy).dest = DEST_EXPLICIT ];

    optional string extras = 10 [ (.android.privacy).dest = DEST_EXPLICIT ];

    optional string extras = 10 [ (.android.privacy).dest = DEST_LOCAL ];

    optional int32 content_user_hint = 11;

    optional string selector = 12;

}

core/proto/android/os/looper.proto

+3 −3
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import "frameworks/base/libs/incident/proto/android/privacy.proto"; 
message LooperProto {

    option (.android.msg_privacy).dest = DEST_AUTOMATIC;



    optional string thread_name = 1 [ (.android.privacy).dest = DEST_EXPLICIT ];

    // the thread name, usually set by developers.

    optional string thread_name = 1;

    optional int64 thread_id = 2;

    optional int32 identity_hash_code = 3;

    optional android.os.MessageQueueProto queue = 4;

    optional android.os.MessageQueueProto queue = 3;

}