Merge "Remove unused variable from PhoneWindowManager"

This commit is contained in:
TreeHugger Robot
2020-08-10 14:45:38 +00:00
committed by Android (Google) Code Review

View File

@@ -450,7 +450,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
volatile int mPendingWakeKey = PENDING_KEY_NULL;
int mRecentAppsHeldModifiers;
boolean mLanguageSwitchKeyPressed;
int mCameraLensCoverState = CAMERA_LENS_COVER_ABSENT;
boolean mHaveBuiltInKeyboard;
@@ -2938,12 +2937,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mWindowManagerFuncs.switchKeyboardLayout(event.getDeviceId(), direction);
return -1;
}
if (mLanguageSwitchKeyPressed && !down
&& (keyCode == KeyEvent.KEYCODE_LANGUAGE_SWITCH
|| keyCode == KeyEvent.KEYCODE_SPACE)) {
mLanguageSwitchKeyPressed = false;
return -1;
}
if (isValidGlobalKey(keyCode)
&& mGlobalKeyManager.handleGlobalKey(mContext, keyCode, event)) {