diff options
| author | Aaron Huang <huangaaron@google.com> | 2020-12-24 06:34:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-24 06:34:32 +0000 |
| commit | 8f96256d85203b3374817cfabcacb92941939490 (patch) | |
| tree | 4f9effb13911b2c3f440eb45cba5a0f8ab5c9641 /core/java/android | |
| parent | dc68043ad08852214fb64986289554e03c09b04d (diff) | |
| parent | a34d9a7af11af589af3aafb72e874ceeacf86a7f (diff) | |
Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: a34d9a7af1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idc48a3618c12f332a5e067973519ab7777058fdf
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/INetworkPolicyManager.aidl | 3 | ||||
| -rw-r--r-- | core/java/android/net/NetworkPolicyManager.java | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/net/INetworkPolicyManager.aidl b/core/java/android/net/INetworkPolicyManager.aidl index e486052e0e53..792e5b410afc 100644 --- a/core/java/android/net/INetworkPolicyManager.aidl +++ b/core/java/android/net/INetworkPolicyManager.aidl @@ -17,6 +17,7 @@ package android.net; import android.net.INetworkPolicyListener; +import android.net.Network; import android.net.NetworkPolicy; import android.net.NetworkQuotaInfo; import android.net.NetworkState; @@ -67,6 +68,8 @@ interface INetworkPolicyManager { void setDeviceIdleMode(boolean enabled); void setWifiMeteredOverride(String networkId, int meteredOverride); + int getMultipathPreference(in Network network); + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state); diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index f05f033b2fa5..ce16a7835179 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -432,6 +432,17 @@ public class NetworkPolicyManager { } } + /** + * Get multipath preference for the given network. + */ + public int getMultipathPreference(Network network) { + try { + return mService.getMultipathPreference(network); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + /** {@hide} */ @Deprecated public static Iterator<Pair<ZonedDateTime, ZonedDateTime>> cycleIterator(NetworkPolicy policy) { |