Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).

Change-Id: I154e27f615932bfcc08993aa361a6d2ffbc51d74

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base