commit | ce8ed972429b47a0fa287bdc22bf1283d7fefebe | [log] [tgz] |
---|---|---|
author | Paul Hu <paulhu@google.com> | Tue Jan 25 04:33:03 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 25 04:33:03 2022 +0000 |
tree | dd8984e75366835eb3c707c39a61b53d183df087 | |
parent | bf4423ed1ce64db39063848fa0416639f97712ba [diff] | |
parent | e16bbe9bfee9dd3ec74ac617cd0fb2d99ec99246 [diff] |
Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar" am: eead25d263 am: e16bbe9bfe Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951100 Change-Id: I236238046a9802ecdc5402cab53eaee47e333ca1
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)