Merge "Add checking permission at the setDataSaverModeEnabled()" am: 639fe64ce0

am: a83bbf3516

Change-Id: I6f712ec5774287af1740f2e74a4bc5cbca0cba6c
This commit is contained in:
Sehee Park
2018-01-11 06:55:39 +00:00
committed by android-build-merger

View File

@@ -18,6 +18,7 @@ package com.android.server;
import static android.Manifest.permission.CONNECTIVITY_INTERNAL; import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
import static android.Manifest.permission.DUMP; import static android.Manifest.permission.DUMP;
import static android.Manifest.permission.NETWORK_SETTINGS;
import static android.Manifest.permission.NETWORK_STACK; import static android.Manifest.permission.NETWORK_STACK;
import static android.Manifest.permission.SHUTDOWN; import static android.Manifest.permission.SHUTDOWN;
import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE; import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE;
@@ -1768,6 +1769,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub
@Override @Override
public boolean setDataSaverModeEnabled(boolean enable) { public boolean setDataSaverModeEnabled(boolean enable) {
mContext.enforceCallingOrSelfPermission(NETWORK_SETTINGS, TAG);
if (DBG) Log.d(TAG, "setDataSaverMode: " + enable); if (DBG) Log.d(TAG, "setDataSaverMode: " + enable);
synchronized (mQuotaLock) { synchronized (mQuotaLock) {
if (mDataSaverMode == enable) { if (mDataSaverMode == enable) {