diff options
Diffstat (limited to 'src')
3 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index 1476f4a0..984d2fcd 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -285,7 +285,7 @@ public class DownloadThread extends Thread { // Use the caller's default network to make this connection, since // they might be subject to restrictions that we shouldn't let them // circumvent - mNetwork = mSystemFacade.getActiveNetwork(mInfo.mUid, mIgnoreBlocked); + mNetwork = mSystemFacade.getNetwork(mParams); if (mNetwork == null) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "No network associated with requesting UID"); diff --git a/src/com/android/providers/downloads/RealSystemFacade.java b/src/com/android/providers/downloads/RealSystemFacade.java index 1c2ba581..7bcdb795 100644 --- a/src/com/android/providers/downloads/RealSystemFacade.java +++ b/src/com/android/providers/downloads/RealSystemFacade.java @@ -17,6 +17,7 @@ package com.android.providers.downloads; import android.app.DownloadManager; +import android.app.job.JobParameters; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -30,13 +31,13 @@ import android.net.NetworkInfo; import android.security.NetworkSecurityPolicy; import android.security.net.config.ApplicationConfig; +import com.android.internal.util.ArrayUtils; + import java.security.GeneralSecurityException; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; -import com.android.internal.util.ArrayUtils; - class RealSystemFacade implements SystemFacade { private Context mContext; @@ -50,9 +51,8 @@ class RealSystemFacade implements SystemFacade { } @Override - public Network getActiveNetwork(int uid, boolean ignoreBlocked) { - return mContext.getSystemService(ConnectivityManager.class) - .getActiveNetworkForUid(uid, ignoreBlocked); + public Network getNetwork(JobParameters params) { + return params.getNetwork(); } @Override diff --git a/src/com/android/providers/downloads/SystemFacade.java b/src/com/android/providers/downloads/SystemFacade.java index 53d14041..8be25c21 100644 --- a/src/com/android/providers/downloads/SystemFacade.java +++ b/src/com/android/providers/downloads/SystemFacade.java @@ -16,14 +16,15 @@ package com.android.providers.downloads; +import android.app.job.JobParameters; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; import android.net.Network; -import android.net.NetworkCapabilities; import android.net.NetworkInfo; import java.security.GeneralSecurityException; + import javax.net.ssl.SSLContext; interface SystemFacade { @@ -32,7 +33,7 @@ interface SystemFacade { */ public long currentTimeMillis(); - public Network getActiveNetwork(int uid, boolean ignoreBlocked); + public Network getNetwork(JobParameters params); public NetworkInfo getNetworkInfo(Network network, int uid, boolean ignoreBlocked); |