diff options
| author | Roshan Pius <rpius@google.com> | 2017-08-03 00:22:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-03 00:22:42 +0000 |
| commit | 6ff9b60d474d928e6258a8c54b92c56321e6b74e (patch) | |
| tree | 0134b6455c4bd04d122d0e6b400d68b095a7d6e9 /service | |
| parent | cdd37192567ccf51d78dd13ffd72ab1c19363869 (diff) | |
| parent | a49af7fd6bf5d51ef7c34fbf2d71ee10c0f7d1dd (diff) | |
Merge "WifiStateMachine: Always return a copy of WifiInfo" into oc-mr1-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index efea94b78..5f970026f 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1758,9 +1758,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss */ public WifiInfo syncRequestConnectionInfo() { int uid = Binder.getCallingUid(); - if (uid == Process.myUid()) return mWifiInfo; - boolean hideBssidAndSsid = true; WifiInfo result = new WifiInfo(mWifiInfo); + if (uid == Process.myUid()) return result; + boolean hideBssidAndSsid = true; result.setMacAddress(WifiInfo.DEFAULT_MAC_ADDRESS); IPackageManager packageManager = AppGlobals.getPackageManager(); |