summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Huang <huangaaron@google.com>2020-12-16 05:28:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-16 05:28:09 +0000
commit1a55dfc1e17416a0db9968f02982925a56271af8 (patch)
treebd4b2d8469b92ac599f40b0070fd429cf788e950
parent046fae1a650f75ca167039d29daa994763c4a6d9 (diff)
parentcecbb25a26e9073735b9da3cd0f040eb8d5c77a6 (diff)
Merge "Move MultipathPolicyTracker back to framework" am: a2c355cc18 am: 8192596775 am: cecbb25a26
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519959 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I154a34e1fc7247d1b03091daab2d99d69103b9a6
-rw-r--r--services/core/Android.bp1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 252fd63ae83c..f8481971b1d6 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -219,7 +219,6 @@ filegroup {
"java/com/android/server/connectivity/KeepaliveTracker.java",
"java/com/android/server/connectivity/LingerMonitor.java",
"java/com/android/server/connectivity/MockableSystemProperties.java",
- "java/com/android/server/connectivity/MultipathPolicyTracker.java",
"java/com/android/server/connectivity/Nat464Xlat.java",
"java/com/android/server/connectivity/NetdEventListenerService.java",
"java/com/android/server/connectivity/NetworkAgentInfo.java",