summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-02-07 16:43:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-07 16:43:35 -0800
commitf8c8199f449cd398dfa48c4b88a126eb298469c7 (patch)
treeb58e0be2a07bc436dfd4de77fd508c645894504e
parentc3711e7dc10990933db7f6933fa8627ad83a4aca (diff)
parent50c85944bf5e949ad5116fec9564318b3be90f24 (diff)
downloadandroid_packages_providers_DownloadProvider-f8c8199f449cd398dfa48c4b88a126eb298469c7.tar.gz
android_packages_providers_DownloadProvider-f8c8199f449cd398dfa48c4b88a126eb298469c7.tar.bz2
android_packages_providers_DownloadProvider-f8c8199f449cd398dfa48c4b88a126eb298469c7.zip
am 50c85944: Match INetworkPolicyListener changes.
* commit '50c85944bf5e949ad5116fec9564318b3be90f24': Match INetworkPolicyListener changes.
-rw-r--r--src/com/android/providers/downloads/DownloadThread.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 6e111339..197af664 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -16,8 +16,6 @@
package com.android.providers.downloads;
-import static android.Manifest.permission.MANAGE_NETWORK_POLICY;
-
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
@@ -47,7 +45,6 @@ import java.io.InputStream;
import java.io.SyncFailedException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Locale;
/**
* Runs an actual download
@@ -959,9 +956,7 @@ public class DownloadThread extends Thread {
private INetworkPolicyListener mPolicyListener = new INetworkPolicyListener.Stub() {
@Override
public void onUidRulesChanged(int uid, int uidRules) {
- // only someone like NPMS should only be calling us
- mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, Constants.TAG);
-
+ // caller is NPMS, since we only register with them
if (uid == mInfo.mUid) {
mPolicyDirty = true;
}
@@ -969,9 +964,13 @@ public class DownloadThread extends Thread {
@Override
public void onMeteredIfacesChanged(String[] meteredIfaces) {
- // only someone like NPMS should only be calling us
- mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, Constants.TAG);
+ // caller is NPMS, since we only register with them
+ mPolicyDirty = true;
+ }
+ @Override
+ public void onRestrictBackgroundChanged(boolean restrictBackground) {
+ // caller is NPMS, since we only register with them
mPolicyDirty = true;
}
};