| commit | 1aafac2782d4a940888878fab2cf19b2c74e5703 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Jul 30 03:17:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 30 03:17:44 2020 +0000 |
| tree | 0c1ad35a06629c9077433b8cbcf4e86b9bafb81c | |
| parent | efbd79c600590ed62f56032fc466f8e83c237d42 [diff] | |
| parent | ae5caa00132f4fd2184dff7f19343375edd1afc8 [diff] |
Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618 Change-Id: I8426e89337e60c48ad20677e835d36622d41ed91
diff --git a/packages/Tethering/src/android/net/util/TetheringMessageBase.java b/packages/Tethering/src/android/net/util/TetheringMessageBase.java index 1b763ce..29c0a81 100644 --- a/packages/Tethering/src/android/net/util/TetheringMessageBase.java +++ b/packages/Tethering/src/android/net/util/TetheringMessageBase.java
@@ -19,7 +19,7 @@ * This class defines Message.what base addresses for various state machine. */ 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; }