summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-11-21 01:09:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-21 01:09:06 +0000
commit935bacec4a39e6213025dfb15def6cc8af514b57 (patch)
tree234a30e0da3b83d0885277df23cfde52a10037a7 /core/java
parenta7d5a0c9e54855108c463ec44c5279e2897fba35 (diff)
parent00326a8902337d68aa44372cd06cc09602e855d0 (diff)
Merge "Update UntaggedSocketViolation StrictMode message to reference TrafficStats.setThreadStatsTag instead of the erroneous TrafficStats.setThreadSocketTag." am: 00326a8902
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503394 Change-Id: Iceeebd923880c2de81ff4a2b2146ec2b9e98803d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/strictmode/UntaggedSocketViolation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/strictmode/UntaggedSocketViolation.java b/core/java/android/os/strictmode/UntaggedSocketViolation.java
index 3b1ef253b2d2..c34d6e821f7a 100644
--- a/core/java/android/os/strictmode/UntaggedSocketViolation.java
+++ b/core/java/android/os/strictmode/UntaggedSocketViolation.java
@@ -18,7 +18,7 @@ package android.os.strictmode;
public final class UntaggedSocketViolation extends Violation {
/** @hide */
public UntaggedSocketViolation() {
- super("Untagged socket detected; use TrafficStats.setThreadSocketTag() to "
+ super("Untagged socket detected; use TrafficStats.setTrafficStatsTag() to "
+ "track all network usage");
}
}