diff options
| author | Roshan Pius <rpius@google.com> | 2019-09-19 07:34:36 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-09-20 14:00:04 +0000 |
| commit | 4d27cab6de2984871ab38d22e13f7677f95a3341 (patch) | |
| tree | 2440d2beffa38fd59d3671e5d771fb36ffa970f5 /service/java/com/android/server/wifi/WifiNetworkFactory.java | |
| parent | c9d68061749a93378f575199798f676a2b5c37a8 (diff) | |
| download | android_frameworks_opt_net_wifi-4d27cab6de2984871ab38d22e13f7677f95a3341.tar.gz android_frameworks_opt_net_wifi-4d27cab6de2984871ab38d22e13f7677f95a3341.tar.bz2 android_frameworks_opt_net_wifi-4d27cab6de2984871ab38d22e13f7677f95a3341.zip | |
Fix a bunch of multi-user API calls
To handle multi-user scenarios, pass in the corresponding app's user id
to fetch app info.
Bug: 140895783
Test: atest com.android.server.wifi
Test: Ran presubmit ACTS tests
Change-Id: I400bad75510b064ad405fae07f56671d2c211178
Merged-In: I400bad75510b064ad405fae07f56671d2c211178
(cherry-picked from a1bbebf25cb7b4e33a7b5abaa6ee6402de95ebc9)
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( |