Merge "Annotate some data classes with @Keep." into main (1114b6fe) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/NetworkPolicyLogger.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import android.util.ArraySet;
		import android.util.Log;
		import android.util.Slog;

		import com.android.internal.annotations.Keep;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.RingBuffer;
		import com.android.server.am.ProcessList;
		@@ -693,6 +694,7 @@ public class NetworkPolicyLogger {
		* Note: This class needs to be public for RingBuffer class to be able to create
		* new instances of this.
		*/
		@Keep
		public static final class Data {
		public int type;
		public long timeStamp;

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.util.Slog;
		import android.util.TimeUtils;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.Keep;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.RingBuffer;
		import com.android.server.usage.BroadcastResponseStatsTracker.NotificationEventType;
		@@ -178,6 +179,7 @@ public class BroadcastResponseStatsLogger {
		}
		}

		@Keep
		public static final class BroadcastEvent implements Data {
		public int sourceUid;
		public int targetUserId;
		@@ -198,6 +200,7 @@ public class BroadcastResponseStatsLogger {
		}
		}

		@Keep
		public static final class NotificationEvent implements Data {
		public int type;
		public String packageName;