Merge "Always use Slog in InputMethodSubtypeSwitchingController" into sc-dev (0bbe29b6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.content.Context;
		import android.content.pm.PackageManager;
		import android.text.TextUtils;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.Printer;
		import android.util.Slog;
		import android.view.inputmethod.InputMethodInfo;
		@@ -502,7 +501,7 @@ final class InputMethodSubtypeSwitchingController {
		public void onUserActionLocked(InputMethodInfo imi, InputMethodSubtype subtype) {
		if (mController == null) {
		if (DEBUG) {
		Log.e(TAG, "mController shouldn't be null.");
		Slog.e(TAG, "mController shouldn't be null.");
		}
		return;
		}
		@@ -520,7 +519,7 @@ final class InputMethodSubtypeSwitchingController {
		InputMethodSubtype subtype) {
		if (mController == null) {
		if (DEBUG) {
		Log.e(TAG, "mController shouldn't be null.");
		Slog.e(TAG, "mController shouldn't be null.");
		}
		return null;
		}