| commit | ddf9443bf006771945620a33f7dbf6fbe0be089f | [log] [tgz] |
|---|---|---|
| author | Nate(Qiang) Jiang <qiangjiang@google.com> | Tue Feb 25 14:33:28 2020 -0800 |
| committer | Cody Kesting <ckesting@google.com> | Wed Mar 18 09:52:15 2020 -0700 |
| tree | e95c4df1424aac964178f19242a57635e8e20e62 | |
| parent | 5053b2f991c1bc1a6d838346bfd0207a7b5fd06d [diff] |
Set creatorUid to NetworkCapabilities after connection Bug: 150230289 Test: atest com.android.server.wifi Change-Id: Id83cca080e1b7b03699a2dadf6d92c52f298730c Merged-In: Id83cca080e1b7b03699a2dadf6d92c52f298730c (cherry picked from commit ffa8f72e4e7a1f7ab8849a355aae2f60b8e8fd71)
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index dce7ea4..9b186a5 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -4659,6 +4659,8 @@ result.addCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED); } + result.setOwnerUid(currentWifiConfiguration.creatorUid); + if (!WifiConfiguration.isMetered(currentWifiConfiguration, mWifiInfo)) { result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); } else {
diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index ee16c57..8aac40a 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -3413,6 +3413,8 @@ new WifiNetworkAgentSpecifier(mCmi.getCurrentWifiConfiguration(), Process.INVALID_UID, ""); assertEquals(expectedWifiNetworkAgentSpecifier, wifiNetworkAgentSpecifier); + + assertEquals(mConnectedNetwork.creatorUid, networkCapabilities.getOwnerUid()); } /**