diff options
author | Roshan Pius <rpius@google.com> | 2018-11-27 12:48:04 -0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2018-11-29 13:01:28 -0800 |
commit | 47def22f4979f28e11acf57347ac8fc103849e6f (patch) | |
tree | c3d75540b0148179ad4c6ef42de7b507c1259474 /service/java | |
parent | 831804892f0a8d30c5a54536b7d54b6af88dee6e (diff) | |
download | android_frameworks_opt_net_wifi-47def22f4979f28e11acf57347ac8fc103849e6f.tar.gz android_frameworks_opt_net_wifi-47def22f4979f28e11acf57347ac8fc103849e6f.tar.bz2 android_frameworks_opt_net_wifi-47def22f4979f28e11acf57347ac8fc103849e6f.zip |
WifiNetworkFactory: Implement UI activity start
UI activity will be started every time we start processing a new
request.
The corresponding UI implementation is under review in ag/5605669.
Bug: 113878056
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I27af3edb5571a33fb8caa7ffebd50d3b8a7cf580
Diffstat (limited to 'service/java')
-rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkFactory.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java index 46a640aeb..e3a8d5c32 100644 --- a/service/java/com/android/server/wifi/WifiNetworkFactory.java +++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java @@ -23,6 +23,7 @@ import android.annotation.NonNull; import android.app.ActivityManager; import android.app.AlarmManager; import android.content.Context; +import android.content.Intent; import android.net.MacAddress; import android.net.NetworkCapabilities; import android.net.NetworkFactory; @@ -42,6 +43,7 @@ import android.os.Message; import android.os.Messenger; import android.os.Process; import android.os.RemoteException; +import android.os.UserHandle; import android.os.WorkSource; import android.text.TextUtils; import android.util.Log; @@ -70,6 +72,10 @@ public class WifiNetworkFactory extends NetworkFactory { public static final int NETWORK_CONNECTION_TIMEOUT_MS = 30 * 1000; // 30 seconds @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"; + @VisibleForTesting + public static final String UI_START_INTENT_CATEGORY = "android.intent.category.DEFAULT"; private final Context mContext; private final ActivityManager mActivityManager; @@ -380,7 +386,8 @@ public class WifiNetworkFactory extends NetworkFactory { wns.ssidPatternMatcher, wns.bssidPatternMatcher, wns.wifiConfiguration, wns.requestorUid); - // TODO(b/113878056): Start UI flow here. + // Start UI to let the user grant/disallow this request from the app. + startUi(); // Trigger periodic scans for finding a network in the request. startPeriodicScans(); } @@ -785,5 +792,15 @@ public class WifiNetworkFactory extends NetworkFactory { TAG, mConnectionTimeoutAlarmListener, mHandler); mConnectionTimeoutSet = true; } + + private void startUi() { + Intent intent = new Intent(); + 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); + mContext.startActivityAsUser(intent, + UserHandle.getUserHandleForUid( + mActiveSpecificNetworkRequestSpecifier.requestorUid)); + } } |