From 5f12920401e0965255f41b64b2e5ce76dadf485f Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 10 Jan 2019 09:58:45 -0800 Subject: WifiNetworkFactory: Send package name to UI Also, a) Change the name of intent action string to be in conformance with API guidelines. b) Refactored an existing meta unit test to inline test. Bug: 117399926 Bug: 113878056 Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I0a4ddb9e7abaf6f694ac8827a530cd0505d46b81 --- service/java/com/android/server/wifi/WifiNetworkFactory.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'service/java/com/android/server/wifi/WifiNetworkFactory.java') diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java index ba3407b5f..57d1635db 100644 --- a/service/java/com/android/server/wifi/WifiNetworkFactory.java +++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java @@ -73,9 +73,13 @@ public class WifiNetworkFactory extends NetworkFactory { @VisibleForTesting public static final int USER_SELECTED_NETWORK_CONNECT_RETRY_MAX = 3; // max of 3 retries. @VisibleForTesting - public static final String UI_START_INTENT_ACTION = "com.android.settings.wifi.NETWORK_REQUEST"; + public static final String UI_START_INTENT_ACTION = + "com.android.settings.wifi.action.NETWORK_REQUEST"; @VisibleForTesting public static final String UI_START_INTENT_CATEGORY = "android.intent.category.DEFAULT"; + @VisibleForTesting + public static final String UI_START_INTENT_EXTRA_PACKAGE_NAME = + "com.android.settings.wifi.extra.PACKAGE_NAME"; private final Context mContext; private final ActivityManager mActivityManager; @@ -905,9 +909,11 @@ public class WifiNetworkFactory extends NetworkFactory { intent.setAction(UI_START_INTENT_ACTION); intent.addCategory(UI_START_INTENT_CATEGORY); intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK); + int requestorUid = mActiveSpecificNetworkRequestSpecifier.requestorUid; + intent.putExtra(UI_START_INTENT_EXTRA_PACKAGE_NAME, + mContext.getPackageManager().getNameForUid(requestorUid)); mContext.startActivityAsUser(intent, - UserHandle.getUserHandleForUid( - mActiveSpecificNetworkRequestSpecifier.requestorUid)); + UserHandle.getUserHandleForUid(requestorUid)); } } -- cgit v1.2.3