PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am: 0b302499cd

Browse Source 
am: 1635941c9a

Change-Id: Ic13938e0f4e876e3dfaea2049f2a7650b53fa8e1
This commit is contained in:
Oscar Shu
2018-04-26 11:40:09 -07:00
committed by android-build-merger
parent 325dd44145 1635941c9a
commit f64502ea86
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
View File

@@ -20,6 +20,7 @@ import android.Manifest;
import android.app.AppOpsManager;
import android.content.Context;
import com.android.internal.util.ArrayUtils;
import com.android.settings.applications.AppStateAppOpsBridge;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settingslib.applications.ApplicationsState;
@@ -37,6 +38,7 @@ public class AppStateChangeWifiStateBridge extends AppStateAppOpsBridge {
private static final String TAG = "AppStateChangeWifiStateBridge";
private static final int APP_OPS_OP_CODE = AppOpsManager.OP_CHANGE_WIFI_STATE;
private static final String PM_CHANGE_WIFI_STATE = Manifest.permission.CHANGE_WIFI_STATE;
private static final String PM_NETWORK_SETTINGS = Manifest.permission.NETWORK_SETTINGS;
private static final String[] PM_PERMISSIONS = {
PM_CHANGE_WIFI_STATE
@@ -86,6 +88,17 @@ public class AppStateChangeWifiStateBridge extends AppStateAppOpsBridge {
return false;
}
WifiSettingsState wifiSettingsState = (WifiSettingsState) info.extraInfo;
if (wifiSettingsState.packageInfo != null) {
final String[] requestedPermissions
= wifiSettingsState.packageInfo.requestedPermissions;
if (ArrayUtils.contains(requestedPermissions, PM_NETWORK_SETTINGS)) {
/*
* NETWORK_SETTINGS permission trumps CHANGE_WIFI_CONFIG, so remove this from
* the list.
*/
return false;
}
}
return wifiSettingsState.permissionDeclared;
}
};