From 256298eb94d34fd7e76ba4f0e4528d433e68ceac Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Thu, 21 Feb 2019 17:07:57 +0900
Subject: [PATCH] Change getPackageUid to getPackageUidAsUser

The wrong overload of PackageManager is being called, setting
USER_SYSTEM as flag instead of the user to resolve the network stack
UID.

Test: phone boots, WiFi works, additional tests in child CLs
Change-Id: I89b11b38c390d0e77a5917c74daccccd74c2d0a3
---
 services/net/java/android/net/NetworkStackClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/net/java/android/net/NetworkStackClient.java b/services/net/java/android/net/NetworkStackClient.java
index 1eb7b98d801a7..c09be82cb420a 100644
--- a/services/net/java/android/net/NetworkStackClient.java
+++ b/services/net/java/android/net/NetworkStackClient.java
@@ -203,7 +203,7 @@ public class NetworkStackClient {
         final PackageManager pm = context.getPackageManager();
         int uid = -1;
         try {
-            uid = pm.getPackageUid(comp.getPackageName(), UserHandle.USER_SYSTEM);
+            uid = pm.getPackageUidAsUser(comp.getPackageName(), UserHandle.USER_SYSTEM);
         } catch (PackageManager.NameNotFoundException e) {
             Slog.wtf("Network stack package not found", e);
             // Fall through