Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of e96a8207 to master

Browse Source 
Change-Id: I90801b35ed0c00078a47faadc7fbb05d2e5fe381
This commit is contained in:
Kenny Root
2013-06-10 11:09:28 -07:00
parent be4e6aaa02 e96a820771
commit 3606254a50
4 changed files with 97 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/NetworkManagementService.java
View File

@@ -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();