diff options
| author | 2023-12-27 20:20:34 +0000 | |
|---|---|---|
| committer | 2023-12-27 20:20:34 +0000 | |
| commit | 1114b6fe0219d820f654e220eb23e2cb8b90148b (patch) | |
| tree | f3509c0301d6bdc183d39f43cf62bc46775a3424 | |
| parent | 957aa62c5177fbae042808f83575b129065ccedc (diff) | |
| parent | cb279f32eda6554607ec9ab674fe3ae804224037 (diff) | |
Merge "Annotate some data classes with @Keep." into main
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyLogger.java | 2 | ||||
| -rw-r--r-- | services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyLogger.java b/services/core/java/com/android/server/net/NetworkPolicyLogger.java index 85731651dd59..4d19eade5a05 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyLogger.java +++ b/services/core/java/com/android/server/net/NetworkPolicyLogger.java @@ -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; diff --git a/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java b/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java index bfc17713b6a8..336bfdd0fb14 100644 --- a/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java +++ b/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java @@ -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; |