diff options
| author | Kenny Root <kroot@google.com> | 2013-06-10 11:09:28 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-06-10 11:09:28 -0700 |
| commit | 3606254a507d838dbec0da35f88c432e6eef7643 (patch) | |
| tree | 1ee94607e5383d0fb010060305e93bf75b543c47 /services/java/com/android/server/NetworkManagementService.java | |
| parent | be4e6aaa0252dd7da28b7aa85beba982538efa46 (diff) | |
| parent | e96a820771240d6e2924a8a73961cd8df83fc9af (diff) | |
| download | frameworks_base-3606254a507d838dbec0da35f88c432e6eef7643.zip frameworks_base-3606254a507d838dbec0da35f88c432e6eef7643.tar.gz frameworks_base-3606254a507d838dbec0da35f88c432e6eef7643.tar.bz2 | |
resolved conflicts for merge of e96a8207 to master
Change-Id: I90801b35ed0c00078a47faadc7fbb05d2e5fe381
Diffstat (limited to 'services/java/com/android/server/NetworkManagementService.java')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index a78d68b..1622f0f 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -34,7 +34,6 @@ import static com.android.server.NetworkManagementService.NetdResponseCode.Tethe import static com.android.server.NetworkManagementService.NetdResponseCode.TtyListResult; import static com.android.server.NetworkManagementSocketTagger.PROP_QTAGUID_ENABLED; -import android.bluetooth.BluetoothTetheringDataTracker; import android.content.Context; import android.net.INetworkManagementEventObserver; import android.net.InterfaceConfiguration; @@ -61,6 +60,7 @@ import com.android.internal.app.IBatteryStats; import com.android.internal.net.NetworkStatsFactory; import com.android.internal.util.Preconditions; import com.android.server.NativeDaemonConnector.Command; +import com.android.server.NativeDaemonConnector.SensitiveArg; import com.android.server.net.LockdownVpnTracker; import com.google.android.collect.Maps; @@ -1001,7 +1001,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub } else { mConnector.execute("softap", "set", wlanIface, wifiConfig.SSID, "broadcast", getSecurityType(wifiConfig), - wifiConfig.preSharedKey); + new SensitiveArg(wifiConfig.preSharedKey)); } mConnector.execute("softap", "startap"); } catch (NativeDaemonConnectorException e) { @@ -1051,7 +1051,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub } else { mConnector.execute("softap", "set", wlanIface, wifiConfig.SSID, "broadcast", getSecurityType(wifiConfig), - wifiConfig.preSharedKey); + new SensitiveArg(wifiConfig.preSharedKey)); } } catch (NativeDaemonConnectorException e) { throw e.rethrowAsParcelableException(); |