diff options
| author | Roshan Pius <rpius@google.com> | 2020-04-28 21:32:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-28 21:32:54 +0000 |
| commit | f2fd99dd9bf262c12d6e27ff56af9541a085633a (patch) | |
| tree | 0130ed8151645bfb23a5103a3bdb5b623e76331c | |
| parent | 1db200ec7f87294665398969137ca4446c10d161 (diff) | |
| parent | 28e8bf0213017f49f95e3d61f0bd4d3fd715d08e (diff) | |
Merge "AvailableNetworkNotifier: Use SYSTEM_UID for ONA connection" into rvc-dev am: f2f12a41f0 am: 28e8bf0213
Change-Id: I2013316afc71db629d0b5df04c8b8040a71cc52f
| -rw-r--r-- | service/java/com/android/server/wifi/AvailableNetworkNotifier.java | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/AvailableNetworkNotifier.java b/service/java/com/android/server/wifi/AvailableNetworkNotifier.java index 1ec6fba4a..7243193cd 100644 --- a/service/java/com/android/server/wifi/AvailableNetworkNotifier.java +++ b/service/java/com/android/server/wifi/AvailableNetworkNotifier.java @@ -438,7 +438,7 @@ public class AvailableNetworkNotifier { mWifiMetrics.setNominatorForNetwork(result.netId, mNominatorId); ConnectActionListener connectActionListener = new ConnectActionListener(); mClientModeImpl.connect(null, result.netId, new Binder(), connectActionListener, - connectActionListener.hashCode(), Process.WIFI_UID); + connectActionListener.hashCode(), Process.SYSTEM_UID); addNetworkToBlacklist(mRecommendedNetwork.SSID); } diff --git a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java index f1eeb389d..6dae6f55a 100644 --- a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java @@ -495,7 +495,7 @@ public class OpenNetworkNotifierTest extends WifiBaseTest { public void actionConnectToNetwork_notificationNotShowing_doesNothing() { mBroadcastReceiver.onReceive(mContext, createIntent(ACTION_CONNECT_TO_NETWORK)); verify(mClientModeImpl, never()).connect(any(), anyInt(), any(Binder.class), - any(IActionListener.class), anyInt(), eq(Process.WIFI_UID)); + any(IActionListener.class), anyInt(), eq(Process.SYSTEM_UID)); } /** @@ -516,7 +516,7 @@ public class OpenNetworkNotifierTest extends WifiBaseTest { mBroadcastReceiver.onReceive(mContext, createIntent(ACTION_CONNECT_TO_NETWORK)); verify(mClientModeImpl).connect(eq(null), eq(TEST_NETWORK_ID), any(Binder.class), - any(IActionListener.class), anyInt(), eq(Process.WIFI_UID)); + any(IActionListener.class), anyInt(), eq(Process.SYSTEM_UID)); // Connecting Notification verify(mNotificationBuilder).createNetworkConnectingNotification(OPEN_NET_NOTIFIER_TAG, mDummyNetwork); @@ -697,7 +697,7 @@ public class OpenNetworkNotifierTest extends WifiBaseTest { ArgumentCaptor<IActionListener> connectListenerCaptor = ArgumentCaptor.forClass(IActionListener.class); verify(mClientModeImpl).connect(eq(null), eq(TEST_NETWORK_ID), any(Binder.class), - connectListenerCaptor.capture(), anyInt(), eq(Process.WIFI_UID)); + connectListenerCaptor.capture(), anyInt(), eq(Process.SYSTEM_UID)); IActionListener connectListener = connectListenerCaptor.getValue(); // Connecting Notification |