Misc fixes

- align wifi connection dialog edittext to viewStart
- Generate a random password when wifi tether password is null

Change-Id: Ia5ca6098c9ef4641cb4f8b4e2b126da061e62830
Fixes: 67749595
Fixes: 64967301
Test: robotests
This commit is contained in:
Fan Zhang
2017-11-14 10:22:26 -08:00
parent e1ead4d3d0
commit cb4fb095d7
7 changed files with 58 additions and 4 deletions

View File

@@ -28,6 +28,7 @@ import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
@@ -40,6 +41,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class WifiTetherSettings extends RestrictedDashboardFragment
implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener {
@@ -156,6 +158,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
config.SSID = mSSIDPreferenceController.getSSID();
config.preSharedKey = mPasswordPreferenceController.getPassword();
ensureWifiConfigHasPassword(config);
config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
config.apBand = mApBandPreferenceController.getBandIndex();
@@ -176,6 +179,15 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
.updateDisplay();
}
@VisibleForTesting
static void ensureWifiConfigHasPassword(WifiConfiguration config) {
if (TextUtils.isEmpty(config.preSharedKey)) {
String randomUUID = UUID.randomUUID().toString();
//first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
config.preSharedKey = randomUUID.substring(0, 8) + randomUUID.substring(9, 13);
}
}
@VisibleForTesting
class TetherChangeReceiver extends BroadcastReceiver {
@Override