Merge "DownloadManager flags for network policy."
This commit is contained in:
@@ -16,8 +16,7 @@
|
|||||||
|
|
||||||
package com.android.server;
|
package com.android.server;
|
||||||
|
|
||||||
import static android.Manifest.permission.READ_PHONE_STATE;
|
import static android.Manifest.permission.MANAGE_NETWORK_POLICY;
|
||||||
import static android.Manifest.permission.UPDATE_DEVICE_STATS;
|
|
||||||
import static android.net.ConnectivityManager.isNetworkTypeValid;
|
import static android.net.ConnectivityManager.isNetworkTypeValid;
|
||||||
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
|
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
|
||||||
import static android.net.NetworkPolicyManager.RULE_REJECT_PAID;
|
import static android.net.NetworkPolicyManager.RULE_REJECT_PAID;
|
||||||
@@ -1142,8 +1141,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
@Override
|
@Override
|
||||||
public void onRulesChanged(int uid, int uidRules) {
|
public void onRulesChanged(int uid, int uidRules) {
|
||||||
// only someone like NPMS should only be calling us
|
// only someone like NPMS should only be calling us
|
||||||
// TODO: create permission for modifying data policy
|
mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);
|
||||||
mContext.enforceCallingOrSelfPermission(UPDATE_DEVICE_STATS, TAG);
|
|
||||||
|
|
||||||
if (LOGD_RULES) {
|
if (LOGD_RULES) {
|
||||||
Slog.d(TAG, "onRulesChanged(uid=" + uid + ", uidRules=" + uidRules + ")");
|
Slog.d(TAG, "onRulesChanged(uid=" + uid + ", uidRules=" + uidRules + ")");
|
||||||
|
|||||||
Reference in New Issue
Block a user