Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9104d4 authored Aug 07, 2015 by Svet Ganov

Do not show removed permissions in the UI - framework

bug:23043018

Change-Id: I32efe93f8c52924263b16d80e09fae1a0a6babf5

parent 0c5d3ddf

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
		}

		if (permissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS
		\|\| (permissionInfo.flags & PermissionInfo.FLAG_INSTALLED) == 0) {
		\|\| (permissionInfo.flags & PermissionInfo.FLAG_INSTALLED) == 0
		\|\| (permissionInfo.flags & PermissionInfo.FLAG_HIDDEN) != 0) {
		return null;
		}

src/com/android/packageinstaller/permission/model/PermissionApps.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,9 @@ public class PermissionApps {
		if (requestedPermissionInfo.protectionLevel
		!= PermissionInfo.PROTECTION_DANGEROUS
		\|\| (requestedPermissionInfo.flags
		& PermissionInfo.FLAG_INSTALLED) == 0) {
		& PermissionInfo.FLAG_INSTALLED) == 0
		\|\| (requestedPermissionInfo.flags
		& PermissionInfo.FLAG_HIDDEN) != 0) {
		continue;
		}

src/com/android/packageinstaller/permission/model/PermissionGroups.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,8 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr
		for (PermissionInfo groupPermission : groupPermissions) {
		seenPermissions.add(groupPermission.name);
		if (groupPermission.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS
		&& (groupPermission.flags & PermissionInfo.FLAG_INSTALLED) != 0) {
		&& (groupPermission.flags & PermissionInfo.FLAG_INSTALLED) != 0
		&& (groupPermission.flags & PermissionInfo.FLAG_HIDDEN) == 0) {
		hasRuntimePermissions = true;
		}
		}

src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,11 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader {
		continue;
		}

		if ((perm.flags & PermissionInfo.FLAG_INSTALLED) == 0
		\|\| (perm.flags & PermissionInfo.FLAG_HIDDEN) != 0) {
		continue;
		}

		if (perm.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) {
		PermissionGroupInfo group = getGroup(perm.group, pm);
		PreferenceGroup pref =