| commit | 8f02f86962fc0f700d7cfb6ae418d3293d7fc128 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Mon Nov 16 17:58:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 16 17:58:37 2020 +0000 |
| tree | 2dbff42c2ef5b2969b8227b0024d79f4bc4e2e07 | |
| parent | 24d691f04dc61aa8073919b31a3325866ab18183 [diff] | |
| parent | 9de1e0e4380bccfdf5b0a83d19644ee189b7343f [diff] |
Merge "Remove legacy style metalava suppression" am: e1bb600fc7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698 Change-Id: I86186f315dbac925c11f99993dd71703bd12d6ca
diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index 7376830..4e019cf 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java
@@ -301,7 +301,7 @@ * Changes only take effect during subsequent calls to * {@link #tagSocket(Socket)}. */ - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public static void setThreadStatsUid(int uid) { NetworkManagementSocketTagger.setThreadSocketStatsUid(uid); } @@ -339,7 +339,7 @@ * * @see #setThreadStatsUid(int) */ - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public static void clearThreadStatsUid() { NetworkManagementSocketTagger.setThreadSocketStatsUid(-1); }