Merge "Update IMMS to comply with Android's inclusive language guidance"

2020-08-14 10:06:52 +00:00
parent 2503bf242d 5f2cf2f0a8
commit ddd7797248
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -3450,9 +3450,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
            return InputBindResult.USER_SWITCHING;
        }

-        // Master feature flag that overrides other conditions and forces IME preRendering.
+        // Main feature flag that overrides other conditions and forces IME preRendering.
        if (DEBUG) {
-            Slog.v(TAG, "IME PreRendering MASTER flag: "
+            Slog.v(TAG, "IME PreRendering main flag: "
                    + DebugFlags.FLAG_PRE_RENDER_IME_VIEWS.value() + ", LowRam: " + mIsLowRam);
        }
        // pre-rendering not supported on low-ram devices.