Merge "Added extra check to avoid NPE if package does not exist." into nyc-dev

This commit is contained in:
Felipe Leme
2016-02-17 00:46:14 +00:00
committed by Android (Google) Code Review

View File

@@ -2631,13 +2631,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final int uid = msg.arg1;
final PackageManager pm = mContext.getPackageManager();
final String[] packages = pm.getPackagesForUid(uid);
final int userId = UserHandle.getUserId(uid);
for (String packageName : packages) {
final Intent intent =
new Intent(ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED);
intent.setPackage(packageName);
intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
mContext.sendBroadcastAsUser(intent, UserHandle.of(userId));
if (packages != null) {
final int userId = UserHandle.getUserId(uid);
for (String packageName : packages) {
final Intent intent = new Intent(
ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED);
intent.setPackage(packageName);
intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
mContext.sendBroadcastAsUser(intent, UserHandle.of(userId));
}
} else {
Slog.w(TAG, "no packages for uid " + uid);
}
return true;
}