summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-30 21:38:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-30 21:38:10 +0000
commitbe1d76775b438a5316611a77dbf0989e73037cf9 (patch)
tree0cd8fd1d1c4b68667e0f2df370df41f15fba6fe3 /service
parent329152acb062ea374bb5181d9eb8592cfe80ae42 (diff)
parentebe8480d17af649474b9dd03ce78e76064be23ea (diff)
Merge "ClientModeImpl: Only randomize MAC address at start if feature enabled" into rvc-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/ClientModeImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 7314bb853..49edc366a 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -3585,7 +3585,9 @@ public class ClientModeImpl extends StateMachine {
mLastSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mLastSimBasedConnectionCarrierName = null;
mLastSignalLevel = -1;
- mWifiNative.setMacAddress(mInterfaceName, MacAddressUtils.createRandomUnicastAddress());
+ if (isConnectedMacRandomizationEnabled()) {
+ mWifiNative.setMacAddress(mInterfaceName, MacAddressUtils.createRandomUnicastAddress());
+ }
mWifiInfo.setMacAddress(mWifiNative.getMacAddress(mInterfaceName));
// TODO: b/79504296 This broadcast has been deprecated and should be removed
sendSupplicantConnectionChangedBroadcast(true);