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

Commit 2379796e authored Jun 06, 2016 by Erik Wolsheimer

DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.

CP of 377ded0f

BUG: 25224723
BUG: 28815187
Change-Id: I248468f0d9ccd6aef36b2076bf7f90efb833efd2

parent 7ff57eaf

core/java/android/content/pm/PackageManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2692,7 +2692,7 @@ public abstract class PackageManager {
		* @return Returns an array of one or more packages assigned to the user
		* id, or null if there are no known packages with the given id.
		*/
		public abstract String[] getPackagesForUid(int uid);
		public abstract @Nullable String[] getPackagesForUid(int uid);

		/**
		* Retrieve the official name associated with a user id. This name is
		@@ -2705,7 +2705,7 @@ public abstract class PackageManager {
		* @return Returns a unique name for the given user id, or null if the
		* user id is not currently assigned.
		*/
		public abstract String getNameForUid(int uid);
		public abstract @Nullable String getNameForUid(int uid);

		/**
		* Return the user id associated with a shared user name. Multiple

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -2319,11 +2319,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		final String[] packages = mContext.getPackageManager().getPackagesForUid(uid);
		final int userId = UserHandle.getUserId(uid);

		if (!ArrayUtils.isEmpty(packages)) {
		for (String packageName : packages) {
		if (!mUsageStats.isAppIdle(packageName, uid, userId)) {
		return false;
		}
		}
		}
		return true;
		}