Merge "Merge "Add network disabled reason starting index" into oc-dev am: c7642c3239" into oc-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-05-03 23:03:32 +00:00
committed by Android (Google) Code Review

View File

@@ -838,6 +838,10 @@ public class WifiConfiguration implements Parcelable {
* Default value. Means not disabled * Default value. Means not disabled
*/ */
public static final int NETWORK_SELECTION_ENABLE = 0; public static final int NETWORK_SELECTION_ENABLE = 0;
/**
* The starting index for network selection disabled reasons
*/
public static final int NETWORK_SELECTION_DISABLED_STARTING_INDEX = 1;
/** /**
* @deprecated it is not used any more. * @deprecated it is not used any more.
* This network is disabled because higher layer (>2) network is bad * This network is disabled because higher layer (>2) network is bad