am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp am: f2b39b4773

Original change: undetermined

Change-Id: Ic91787135965a9617152f79b7a478a8f0e125609
This commit is contained in:
Robert Greenwalt
2021-05-31 04:10:37 +00:00
committed by Automerger Merge Worker

View File

@@ -221,6 +221,8 @@ public class ConnectivityManager
/** {@hide} */
public static final int TYPE_DUMMY = 8;
/** {@hide} */
public static final int TYPE_ETHERNET = 9;
/** {@hide} TODO: Need to adjust this for WiMAX. */
public static final int MAX_RADIO_TYPE = TYPE_DUMMY;
/** {@hide} TODO: Need to adjust this for WiMAX. */