commit | 6754e1eafeb3dc1c0eef77ce2727326aa2bc9235 | [log] [tgz] |
---|---|---|
author | Paul Hu <paulhu@google.com> | Tue Jan 25 04:45:25 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 25 04:45:25 2022 +0000 |
tree | d064553d5779c33ceec222512993e5462851cf53 | |
parent | c7a9d7115b06e74652e696f6d1a9985c4f6eaa54 [diff] | |
parent | d743f4bfc8553c8d3180a0d9a51b183f04693356 [diff] |
Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar" am: eead25d263 am: d743f4bfc8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951100 Change-Id: Ie1cef27e3c3705637e00984ee92465c80cb58b2f
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index e5d1a88..cc0cbcc 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt
@@ -90,5 +90,9 @@ # From services-connectivity-shared-srcs rule android.net.util.NetworkConstants* com.android.connectivity.@0 +# From modules-utils-statemachine +rule com.android.internal.util.IState* com.android.connectivity.@0 +rule com.android.internal.util.State* com.android.connectivity.@0 + # Remaining are connectivity sources in com.android.server and com.android.server.connectivity: # TODO: move to a subpackage of com.android.connectivity (such as com.android.connectivity.server)