Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e64a8bbc: am e4035827: Merge "Always initialize local boolean variables when possible" into klp-dev

Browse Source 
* commit 'e64a8bbc37bf3370fb315c1a353274bc7481e352':
  Always initialize local boolean variables when possible
This commit is contained in:
Michael Wright
2013-10-29 16:59:53 -07:00
committed by Android Git Automerger
parent 6ec49e58ab e64a8bbc37
commit f129536f8e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/input/InputReader.cpp
View File

@@ -2135,12 +2135,11 @@ void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t keyCode,
}
}
bool metaStateChanged = false;
int32_t oldMetaState = mMetaState;
int32_t newMetaState = updateMetaState(keyCode, down, oldMetaState);
if (oldMetaState != newMetaState) {
bool metaStateChanged = oldMetaState != newMetaState;
if (metaStateChanged) {
mMetaState = newMetaState;
metaStateChanged = true;
updateLedState(false);
}
@@ -2932,7 +2931,6 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
int32_t rawHeight = mRawPointerAxes.y.maxValue - mRawPointerAxes.y.minValue + 1;
// Get associated display dimensions.
bool viewportChanged = false;
DisplayViewport newViewport;
if (mParameters.hasAssociatedDisplay) {
if (!mConfig.getDisplayInfo(mParameters.associatedDisplayIsExternal, &newViewport)) {
@@ -2946,9 +2944,9 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
} else {
newViewport.setNonDisplayViewport(rawWidth, rawHeight);
}
if (mViewport != newViewport) {
bool viewportChanged = mViewport != newViewport;
if (viewportChanged) {
mViewport = newViewport;
viewportChanged = true;
if (mDeviceMode == DEVICE_MODE_DIRECT || mDeviceMode == DEVICE_MODE_POINTER) {
// Convert rotated viewport to natural surface coordinates.
@@ -3017,9 +3015,8 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
}
// If moving between pointer modes, need to reset some state.
bool deviceModeChanged;
if (mDeviceMode != oldDeviceMode) {
deviceModeChanged = true;
bool deviceModeChanged = mDeviceMode != oldDeviceMode;
if (deviceModeChanged) {
mOrientedRanges.clear();
}