Clean up unused parameter warnings.
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.
Change-Id: I100f838d70e591a13abb198dc420000ef114a429
(cherry picked from commit 97a3367a1b
)
This commit is contained in:
parent
108e6334c7
commit
39efe3e5bf
@ -49,51 +49,49 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual void notifyConfigurationChanged(nsecs_t when) {
|
virtual void notifyConfigurationChanged(nsecs_t) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual nsecs_t notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle,
|
virtual nsecs_t notifyANR(const sp<InputApplicationHandle>&,
|
||||||
const sp<InputWindowHandle>& inputWindowHandle,
|
const sp<InputWindowHandle>&,
|
||||||
const String8& reason) {
|
const String8&) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void notifyInputChannelBroken(const sp<InputWindowHandle>& inputWindowHandle) {
|
virtual void notifyInputChannelBroken(const sp<InputWindowHandle>&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig) {
|
virtual void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig) {
|
||||||
*outConfig = mConfig;
|
*outConfig = mConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags) {
|
virtual bool filterInputEvent(const InputEvent*, uint32_t) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void interceptKeyBeforeQueueing(const KeyEvent* keyEvent, uint32_t& policyFlags) {
|
virtual void interceptKeyBeforeQueueing(const KeyEvent*, uint32_t&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags) {
|
virtual void interceptMotionBeforeQueueing(nsecs_t, uint32_t&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual nsecs_t interceptKeyBeforeDispatching(const sp<InputWindowHandle>& inputWindowHandle,
|
virtual nsecs_t interceptKeyBeforeDispatching(const sp<InputWindowHandle>&,
|
||||||
const KeyEvent* keyEvent, uint32_t policyFlags) {
|
const KeyEvent*, uint32_t) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool dispatchUnhandledKey(const sp<InputWindowHandle>& inputWindowHandle,
|
virtual bool dispatchUnhandledKey(const sp<InputWindowHandle>&,
|
||||||
const KeyEvent* keyEvent, uint32_t policyFlags, KeyEvent* outFallbackKeyEvent) {
|
const KeyEvent*, uint32_t, KeyEvent*) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void notifySwitch(nsecs_t when,
|
virtual void notifySwitch(nsecs_t, uint32_t, uint32_t, uint32_t) {
|
||||||
uint32_t switchValues, uint32_t switchMask, uint32_t policyFlags) {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType) {
|
virtual void pokeUserActivity(nsecs_t, int32_t) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool checkInjectEventsPermissionNonReentrant(
|
virtual bool checkInjectEventsPermissionNonReentrant(int32_t, int32_t) {
|
||||||
int32_t injectorPid, int32_t injectorUid) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -104,17 +104,16 @@ private:
|
|||||||
if (mY > mMaxY) mY = mMaxY;
|
if (mY > mMaxY) mY = mMaxY;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void fade(Transition transition) {
|
virtual void fade(Transition) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void unfade(Transition transition) {
|
virtual void unfade(Transition) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void setPresentation(Presentation presentation) {
|
virtual void setPresentation(Presentation) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void setSpots(const PointerCoords* spotCoords,
|
virtual void setSpots(const PointerCoords*, const uint32_t*, BitSet32) {
|
||||||
const uint32_t* spotIdToIndex, BitSet32 spotIdBits) {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void clearSpots() {
|
virtual void clearSpots() {
|
||||||
@ -196,11 +195,11 @@ private:
|
|||||||
mInputDevices = inputDevices;
|
mInputDevices = inputDevices;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const InputDeviceIdentifier& identifier) {
|
virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const InputDeviceIdentifier&) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier) {
|
virtual String8 getDeviceAlias(const InputDeviceIdentifier&) {
|
||||||
return String8::empty();
|
return String8::empty();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -482,7 +481,7 @@ private:
|
|||||||
return device ? device->identifier : InputDeviceIdentifier();
|
return device ? device->identifier : InputDeviceIdentifier();
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int32_t getDeviceControllerNumber(int32_t deviceId) const {
|
virtual int32_t getDeviceControllerNumber(int32_t) const {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -515,7 +514,7 @@ private:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool hasInputProperty(int32_t deviceId, int property) const {
|
virtual bool hasInputProperty(int32_t, int) const {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -553,8 +552,7 @@ private:
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual status_t mapAxis(int32_t deviceId, int32_t scanCode,
|
virtual status_t mapAxis(int32_t, int32_t, AxisInfo*) const {
|
||||||
AxisInfo* outAxisInfo) const {
|
|
||||||
return NAME_NOT_FOUND;
|
return NAME_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -562,7 +560,7 @@ private:
|
|||||||
mExcludedDevices = devices;
|
mExcludedDevices = devices;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual size_t getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize) {
|
virtual size_t getEvents(int, RawEvent* buffer, size_t) {
|
||||||
if (mEvents.empty()) {
|
if (mEvents.empty()) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -680,25 +678,25 @@ private:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual sp<KeyCharacterMap> getKeyCharacterMap(int32_t deviceId) const {
|
virtual sp<KeyCharacterMap> getKeyCharacterMap(int32_t) const {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool setKeyboardLayoutOverlay(int32_t deviceId, const sp<KeyCharacterMap>& map) {
|
virtual bool setKeyboardLayoutOverlay(int32_t, const sp<KeyCharacterMap>&) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void vibrate(int32_t deviceId, nsecs_t duration) {
|
virtual void vibrate(int32_t, nsecs_t) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void cancelVibrate(int32_t deviceId) {
|
virtual void cancelVibrate(int32_t) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool isExternal(int32_t deviceId) const {
|
virtual bool isExternal(int32_t) const {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void dump(String8& dump) {
|
virtual void dump(String8&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void monitor() {
|
virtual void monitor() {
|
||||||
@ -763,18 +761,17 @@ private:
|
|||||||
return mListener.get();
|
return mListener.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void disableVirtualKeysUntil(nsecs_t time) {
|
virtual void disableVirtualKeysUntil(nsecs_t) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool shouldDropVirtualKey(nsecs_t now,
|
virtual bool shouldDropVirtualKey(nsecs_t, InputDevice*, int32_t, int32_t) {
|
||||||
InputDevice* device, int32_t keyCode, int32_t scanCode) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void fadePointer() {
|
virtual void fadePointer() {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void requestTimeoutAtTime(nsecs_t when) {
|
virtual void requestTimeoutAtTime(nsecs_t) {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int32_t bumpGeneration() {
|
virtual int32_t bumpGeneration() {
|
||||||
@ -867,12 +864,11 @@ private:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void configure(nsecs_t when,
|
virtual void configure(nsecs_t, const InputReaderConfiguration*, uint32_t) {
|
||||||
const InputReaderConfiguration* config, uint32_t changes) {
|
|
||||||
mConfigureWasCalled = true;
|
mConfigureWasCalled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void reset(nsecs_t when) {
|
virtual void reset(nsecs_t) {
|
||||||
mResetWasCalled = true;
|
mResetWasCalled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -881,22 +877,22 @@ private:
|
|||||||
mProcessWasCalled = true;
|
mProcessWasCalled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int32_t getKeyCodeState(uint32_t sourceMask, int32_t keyCode) {
|
virtual int32_t getKeyCodeState(uint32_t, int32_t keyCode) {
|
||||||
ssize_t index = mKeyCodeStates.indexOfKey(keyCode);
|
ssize_t index = mKeyCodeStates.indexOfKey(keyCode);
|
||||||
return index >= 0 ? mKeyCodeStates.valueAt(index) : AKEY_STATE_UNKNOWN;
|
return index >= 0 ? mKeyCodeStates.valueAt(index) : AKEY_STATE_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode) {
|
virtual int32_t getScanCodeState(uint32_t, int32_t scanCode) {
|
||||||
ssize_t index = mScanCodeStates.indexOfKey(scanCode);
|
ssize_t index = mScanCodeStates.indexOfKey(scanCode);
|
||||||
return index >= 0 ? mScanCodeStates.valueAt(index) : AKEY_STATE_UNKNOWN;
|
return index >= 0 ? mScanCodeStates.valueAt(index) : AKEY_STATE_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int32_t getSwitchState(uint32_t sourceMask, int32_t switchCode) {
|
virtual int32_t getSwitchState(uint32_t, int32_t switchCode) {
|
||||||
ssize_t index = mSwitchStates.indexOfKey(switchCode);
|
ssize_t index = mSwitchStates.indexOfKey(switchCode);
|
||||||
return index >= 0 ? mSwitchStates.valueAt(index) : AKEY_STATE_UNKNOWN;
|
return index >= 0 ? mSwitchStates.valueAt(index) : AKEY_STATE_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool markSupportedKeyCodes(uint32_t sourceMask, size_t numCodes,
|
virtual bool markSupportedKeyCodes(uint32_t, size_t numCodes,
|
||||||
const int32_t* keyCodes, uint8_t* outFlags) {
|
const int32_t* keyCodes, uint8_t* outFlags) {
|
||||||
bool result = false;
|
bool result = false;
|
||||||
for (size_t i = 0; i < numCodes; i++) {
|
for (size_t i = 0; i < numCodes; i++) {
|
||||||
@ -1536,7 +1532,7 @@ protected:
|
|||||||
};
|
};
|
||||||
|
|
||||||
void KeyboardInputMapperTest::testDPadKeyRotation(KeyboardInputMapper* mapper,
|
void KeyboardInputMapperTest::testDPadKeyRotation(KeyboardInputMapper* mapper,
|
||||||
int32_t originalScanCode, int32_t originalKeyCode, int32_t rotatedKeyCode) {
|
int32_t originalScanCode, int32_t, int32_t rotatedKeyCode) {
|
||||||
NotifyKeyArgs args;
|
NotifyKeyArgs args;
|
||||||
|
|
||||||
process(mapper, ARBITRARY_TIME, DEVICE_ID, EV_KEY, originalScanCode, 1);
|
process(mapper, ARBITRARY_TIME, DEVICE_ID, EV_KEY, originalScanCode, 1);
|
||||||
|
Loading…
Reference in New Issue
Block a user