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

Original change: undetermined

Change-Id: I5e4c35f6353679df388dc8d440c9b26acef1f7f8
This commit is contained in:
Robert Greenwalt
2021-05-31 11:03:27 +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. */