LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "WifiManagerTest: Allow NETWORK_SETTINGS for apps with BIND_QUICK_SETTINGS_TILE" into qt-dev

Browse Source 
am: 026e9c3e77

Change-Id: I0b8d13199fe4d3df33100fc9cf5f6f6c8b6aa676
This commit is contained in:
Roshan Pius
2019-05-03 04:32:17 -07:00
committed by android-build-merger
parent 86398e2699 5dea0afd70
commit a856348e4c
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -747,19 +747,13 @@ public class WifiManagerTest extends AndroidTestCase {
allowedUIDs.add(Process.NFC_UID);
// only quick settings is allowed to bind to the BIND_QUICK_SETTINGS_TILE permission, using
// this fact to determined allowed package name for sysui
String validPkg = "";
final List<PackageInfo> sysuiPackage = pm.getPackagesHoldingPermissions(new String[] {
// this fact to determined allowed package name for sysui. This is a signature permission,
// so allow any package with this permission.
final List<PackageInfo> sysuiPackages = pm.getPackagesHoldingPermissions(new String[] {
android.Manifest.permission.BIND_QUICK_SETTINGS_TILE
}, PackageManager.MATCH_UNINSTALLED_PACKAGES);
if (sysuiPackage.size() > 1) {
fail("The BIND_QUICK_SETTINGS_TILE permission must only be held by one package");
}
if (sysuiPackage.size() == 1) {
validPkg = sysuiPackage.get(0).packageName;
allowedPackages.add(validPkg);
for (PackageInfo info : sysuiPackages) {
allowedPackages.add(info.packageName);
}
// the captive portal flow also currently holds the NETWORK_SETTINGS permission