Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (78c6ee22) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/PermissionMonitor.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
		import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS;
		import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
		import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
		import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;
		import static android.content.pm.PackageManager.GET_PERMISSIONS;

		import android.content.BroadcastReceiver;
		@@ -39,6 +40,8 @@ import android.os.UserManager;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.util.ArrayUtils;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.HashSet;
		@@ -150,16 +153,14 @@ public class PermissionMonitor {
		update(mUsers, mApps, true);
		}

		private boolean hasPermission(PackageInfo app, String permission) {
		if (app.requestedPermissions != null) {
		for (String p : app.requestedPermissions) {
		if (permission.equals(p)) {
		return true;
		}
		}
		}
		private boolean hasPermission(final PackageInfo app, final String permission) {
		if (app.requestedPermissions == null \|\| app.requestedPermissionsFlags == null) {
		return false;
		}
		final int index = ArrayUtils.indexOf(app.requestedPermissions, permission);
		if (index < 0 \|\| index >= app.requestedPermissionsFlags.length) return false;
		return (app.requestedPermissionsFlags[index] & REQUESTED_PERMISSION_GRANTED) != 0;
		}

		private boolean hasNetworkPermission(PackageInfo app) {
		return hasPermission(app, CHANGE_NETWORK_STATE);

services/core/java/com/android/server/pm/PackageManagerService.java

+20 −17

Original line number	Diff line number	Diff line
		@@ -16234,7 +16234,8 @@ public class PackageManagerService extends IPackageManager.Stub {
		* Tries to delete system package.
		*/
		private boolean deleteSystemPackageLIF(PackageParser.Package deletedPkg,
		PackageSetting deletedPs, int[] allUserHandles, int flags, PackageRemovedInfo outInfo,
		PackageSetting deletedPs, int[] allUserHandles, int flags,
		@Nullable PackageRemovedInfo outInfo,
		boolean writeSettings) {
		if (deletedPs.parentPackageName != null) {
		Slog.w(TAG, "Attempt to delete child system package " + deletedPkg.packageName);
		@@ -16242,7 +16243,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		}

		final boolean applyUserRestrictions
		= (allUserHandles != null) && (outInfo.origUsers != null);
		= (allUserHandles != null) && outInfo != null && (outInfo.origUsers != null);
		final PackageSetting disabledPs;
		// Confirm if the system package has been updated
		// An updated system app can be deleted. This will also have to restore
		@@ -16272,6 +16273,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}

		if (outInfo != null) {
		// Delete the updated package
		outInfo.isRemovedPackageSystemUpdate = true;
		if (outInfo.removedChildPackages != null) {
		@@ -16289,6 +16291,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}
		}
		}

		if (disabledPs.versionCode < deletedPs.versionCode) {
		// Delete data for downgrades
		@@ -20187,9 +20190,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		mSettings.writeKernelMappingLPr(ps);
		}

		final UserManager um = mContext.getSystemService(UserManager.class);
		final UserManagerService um = sUserManager;
		UserManagerInternal umInternal = getUserManagerInternal();
		for (UserInfo user : um.getUsers()) {
		for (UserInfo user : um.getUsers(false /* excludeDying */)) {
		final int flags;
		if (umInternal.isUserUnlockingOrUnlocked(user.id)) {
		flags = StorageManager.FLAG_STORAGE_DE \| StorageManager.FLAG_STORAGE_CE;