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

Merge "Avoid redundant store into array list."

Browse Source
This commit is contained in:
Jeff Brown
2013-01-31 21:42:37 +00:00
committed by Android (Google) Code Review
parent f8ce2b94df 8f124842dd
commit 1b0e29aec6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/input/InputManager.java
View File

@@ -212,8 +212,10 @@ public final class InputManager {
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw new RuntimeException("Could not get input device information.", ex); throw new RuntimeException("Could not get input device information.", ex);
} }
if (inputDevice != null) {
mInputDevices.setValueAt(index, inputDevice);
}
} }
mInputDevices.setValueAt(index, inputDevice);
return inputDevice; return inputDevice;
} }
} }
@@ -241,6 +243,8 @@ public final class InputManager {
inputDevice = mIm.getInputDevice(id); inputDevice = mIm.getInputDevice(id);
} catch (RemoteException ex) { } catch (RemoteException ex) {
// Ignore the problem for the purposes of this method. // Ignore the problem for the purposes of this method.
}
if (inputDevice == null) {
continue; continue;
} }
mInputDevices.setValueAt(i, inputDevice); mInputDevices.setValueAt(i, inputDevice);