summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2020-06-29 16:32:20 +0900
committerRemi NGUYEN VAN <reminv@google.com>2020-06-30 18:54:26 +0900
commit20341352aaec52ffd5f6949b09aa5d556babb3c4 (patch)
tree0ee221c7855fe413233dc34f35df02b541b0a51f
parentb8ac953af4ffc4a82fdc9a58f76fd96756c3cf49 (diff)
Fix jarjar rule for LocalLog
LocalLog is in android.util, not android.net. The previous code used to work because methods used by NetworkStack are @UnsupportedAppUsage, but this should be avoided because the symbols are not stable. Bug: 160113128 Test: m; atest NetworkStackTests; manual: wifi working (cherry-pick from AOSP with conflicts) Merged-In: I3864ce089c02d53dfc6d0f9c58ac4a84daaaf787 Change-Id: I3864ce089c02d53dfc6d0f9c58ac4a84daaaf787
-rw-r--r--jarjar-rules-shared.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index 438fc61..048c976 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -11,4 +11,4 @@ rule com.android.net.module.util.** com.android.networkstack.util.@1
# TODO: move DhcpResults into services.net and delete from here
rule android.net.DhcpResultsParcelable* @0
rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1
-rule android.net.LocalLog* android.net.networkstack.LocalLog@1
+rule android.util.LocalLog* android.net.networkstack.util.LocalLog@1