Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 am: 1aafac2782 am: 38b7647244 am: 1012aaa906

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618

Change-Id: Ib1c23f0a9758bdcf55d11ac67ff6ff54dc513066
This commit is contained in:
Chiachang Wang
2020-07-31 01:10:21 +00:00
committed by Automerger Merge Worker

View File

@@ -19,7 +19,7 @@ package android.net.util;
* This class defines Message.what base addresses for various state machine. * This class defines Message.what base addresses for various state machine.
*/ */
public class TetheringMessageBase { public class TetheringMessageBase {
public static final int BASE_MASTER = 0; public static final int BASE_MAIN_SM = 0;
public static final int BASE_IPSERVER = 100; public static final int BASE_IPSERVER = 100;
} }