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

Commit dccf863b authored Feb 23, 2016 by Svetoslav Ganov Committed by Android (Google) Code Review Feb 23, 2016

Merge "Expose removed permissions flag as system API - installer" into nyc-dev

parents 3a26404b 44689865

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

+1 −1

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

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

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import com.android.packageinstaller.R;
		import com.android.packageinstaller.permission.utils.Utils;

		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.List;

		@@ -182,7 +181,7 @@ public class PermissionApps {
		\|\| (requestedPermissionInfo.flags
		& PermissionInfo.FLAG_INSTALLED) == 0
		\|\| (requestedPermissionInfo.flags
		& PermissionInfo.FLAG_HIDDEN) != 0) {
		& PermissionInfo.FLAG_REMOVED) != 0) {
		continue;
		}

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

+1 −1

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader {
		}

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader {
		}

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