Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev

Browse Source
This commit is contained in:
Erik Wolsheimer
2016-06-09 03:25:42 +00:00
committed by Android (Google) Code Review
parent e892848035 2379796e11
commit eae242cfe8
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/PackageManager.java
View File

@@ -2692,7 +2692,7 @@ public abstract class PackageManager {
* @return Returns an array of one or more packages assigned to the user * @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. * 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 * 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 * @return Returns a unique name for the given user id, or null if the
* user id is not currently assigned. * 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 * Return the user id associated with a shared user name. Multiple

2
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -2319,11 +2319,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final String[] packages = mContext.getPackageManager().getPackagesForUid(uid); final String[] packages = mContext.getPackageManager().getPackagesForUid(uid);
final int userId = UserHandle.getUserId(uid); final int userId = UserHandle.getUserId(uid);
if (!ArrayUtils.isEmpty(packages)) {
for (String packageName : packages) { for (String packageName : packages) {
if (!mUsageStats.isAppIdle(packageName, uid, userId)) { if (!mUsageStats.isAppIdle(packageName, uid, userId)) {
return false; return false;
} }
} }
}
return true; return true;
} }