cmsdk: Move WIFI_AUTO_CONNECT_TYPE to CMSettings.
Change-Id: I3a0447006d29cc8d2b1bbed6f841ce9ae55be94f
This commit is contained in:
parent
dac1c3eac1
commit
b006e980e7
|
@ -571,6 +571,15 @@ public class CMSettingsProvider extends ContentProvider {
|
||||||
*/
|
*/
|
||||||
public static final String DIALER_OPENCNAM_AUTH_TOKEN =
|
public static final String DIALER_OPENCNAM_AUTH_TOKEN =
|
||||||
CMSettings.System.DIALER_OPENCNAM_AUTH_TOKEN;
|
CMSettings.System.DIALER_OPENCNAM_AUTH_TOKEN;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether wifi settings will connect to access point automatically
|
||||||
|
* 0 = automatically
|
||||||
|
* 1 = manually
|
||||||
|
* @hide
|
||||||
|
*/
|
||||||
|
public static final String WIFI_AUTO_CONNECT_TYPE =
|
||||||
|
CMSettings.System.WIFI_AUTO_CONNECT_TYPE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -653,6 +662,8 @@ public class CMSettingsProvider extends ContentProvider {
|
||||||
CMSettings.System.DIALER_OPENCNAM_ACCOUNT_SID);
|
CMSettings.System.DIALER_OPENCNAM_ACCOUNT_SID);
|
||||||
systemToCmSettingsMap.put(LegacyCMSettings.DIALER_OPENCNAM_AUTH_TOKEN,
|
systemToCmSettingsMap.put(LegacyCMSettings.DIALER_OPENCNAM_AUTH_TOKEN,
|
||||||
CMSettings.System.DIALER_OPENCNAM_AUTH_TOKEN);
|
CMSettings.System.DIALER_OPENCNAM_AUTH_TOKEN);
|
||||||
|
systemToCmSettingsMap.put(LegacyCMSettings.WIFI_AUTO_CONNECT_TYPE,
|
||||||
|
CMSettings.System.WIFI_AUTO_CONNECT_TYPE);
|
||||||
|
|
||||||
int rowsMigrated = migrateCMSettingsForTable(userId,
|
int rowsMigrated = migrateCMSettingsForTable(userId,
|
||||||
CMDatabaseHelper.CMTableNames.TABLE_SYSTEM, systemToCmSettingsMap);
|
CMDatabaseHelper.CMTableNames.TABLE_SYSTEM, systemToCmSettingsMap);
|
||||||
|
|
|
@ -969,6 +969,14 @@ public final class CMSettings {
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
public static final String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";
|
public static final String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether wifi settings will connect to access point automatically
|
||||||
|
* 0 = automatically
|
||||||
|
* 1 = manually
|
||||||
|
* @hide
|
||||||
|
*/
|
||||||
|
public static final String WIFI_AUTO_CONNECT_TYPE = "wifi_auto_connect_type";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue