diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-20 19:59:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-20 19:59:48 +0000 |
commit | 7957387b5d459386191cf45ca90e45446ed13f93 (patch) | |
tree | 7f21746a02f0da4c1675c8935933e38931d75541 /service/java/com/android/server/wifi/WifiNetworkFactory.java | |
parent | ec1e58cd439ae645ff4e5bf55f7961e359bf0e4c (diff) | |
parent | 4d27cab6de2984871ab38d22e13f7677f95a3341 (diff) | |
download | android_frameworks_opt_net_wifi-7957387b5d459386191cf45ca90e45446ed13f93.tar.gz android_frameworks_opt_net_wifi-7957387b5d459386191cf45ca90e45446ed13f93.tar.bz2 android_frameworks_opt_net_wifi-7957387b5d459386191cf45ca90e45446ed13f93.zip |
Merge "Fix a bunch of multi-user API calls" into qt-qpr1-dev
Diffstat (limited to 'service/java/com/android/server/wifi/WifiNetworkFactory.java')
-rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkFactory.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java index 1f060cf73..c375e9f59 100644 --- a/service/java/com/android/server/wifi/WifiNetworkFactory.java +++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java @@ -1141,10 +1141,11 @@ public class WifiNetworkFactory extends NetworkFactory { mConnectionTimeoutSet = true; } - private @NonNull CharSequence getAppName(@NonNull String packageName) { + private @NonNull CharSequence getAppName(@NonNull String packageName, int uid) { ApplicationInfo applicationInfo = null; try { - applicationInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0); + applicationInfo = mContext.getPackageManager().getApplicationInfoAsUser( + packageName, 0, UserHandle.getUserId(uid)); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "Failed to find app name for " + packageName); return ""; @@ -1159,7 +1160,8 @@ public class WifiNetworkFactory extends NetworkFactory { intent.addCategory(UI_START_INTENT_CATEGORY); intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(UI_START_INTENT_EXTRA_APP_NAME, - getAppName(mActiveSpecificNetworkRequestSpecifier.requestorPackageName)); + getAppName(mActiveSpecificNetworkRequestSpecifier.requestorPackageName, + mActiveSpecificNetworkRequestSpecifier.requestorUid)); intent.putExtra(UI_START_INTENT_EXTRA_REQUEST_IS_FOR_SINGLE_NETWORK, isActiveRequestForSingleNetwork()); mContext.startActivityAsUser(intent, UserHandle.getUserHandleForUid( |