From 62fbb16383d6d8268821f947e2c6d0828f7e2b41 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Sun, 17 Aug 2014 20:01:12 -0700 Subject: [PATCH] Shelve InputFlinger for another release. DO NOT MERGE Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7 --- include/input/IInputFlinger.h | 54 ---------------- libs/input/Android.mk | 1 - libs/input/IInputFlinger.cpp | 59 ----------------- services/inputflinger/Android.mk | 19 +----- services/inputflinger/InputFlinger.cpp | 89 -------------------------- services/inputflinger/InputFlinger.h | 54 ---------------- services/inputflinger/main.cpp | 26 -------- 7 files changed, 1 insertion(+), 301 deletions(-) delete mode 100644 include/input/IInputFlinger.h delete mode 100644 libs/input/IInputFlinger.cpp delete mode 100644 services/inputflinger/InputFlinger.cpp delete mode 100644 services/inputflinger/InputFlinger.h delete mode 100644 services/inputflinger/main.cpp diff --git a/include/input/IInputFlinger.h b/include/input/IInputFlinger.h deleted file mode 100644 index 79ff12a66..000000000 --- a/include/input/IInputFlinger.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _LIBINPUT_IINPUT_FLINGER_H -#define _LIBINPUT_IINPUT_FLINGER_H - -#include -#include - -#include - -namespace android { - -/* - * This class defines the Binder IPC interface for accessing various - * InputFlinger features. - */ -class IInputFlinger : public IInterface { -public: - DECLARE_META_INTERFACE(InputFlinger); - - virtual status_t doSomething() = 0; -}; - - -/** - * Binder implementation. - */ -class BnInputFlinger : public BnInterface { -public: - enum { - DO_SOMETHING_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION, - }; - - virtual status_t onTransact(uint32_t code, const Parcel& data, - Parcel* reply, uint32_t flags = 0); -}; - -} // namespace android - -#endif // _LIBINPUT_IINPUT_FLINGER_H diff --git a/libs/input/Android.mk b/libs/input/Android.mk index 944ac7f65..f1921a4e0 100644 --- a/libs/input/Android.mk +++ b/libs/input/Android.mk @@ -27,7 +27,6 @@ commonSources := \ deviceSources := \ $(commonSources) \ - IInputFlinger.cpp \ InputTransport.cpp \ VelocityControl.cpp \ VelocityTracker.cpp diff --git a/libs/input/IInputFlinger.cpp b/libs/input/IInputFlinger.cpp deleted file mode 100644 index e00973149..000000000 --- a/libs/input/IInputFlinger.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include -#include -#include - -#include - - -namespace android { - -class BpInputFlinger : public BpInterface { -public: - BpInputFlinger(const sp& impl) : - BpInterface(impl) { } - - virtual status_t doSomething() { - Parcel data, reply; - data.writeInterfaceToken(IInputFlinger::getInterfaceDescriptor()); - remote()->transact(BnInputFlinger::DO_SOMETHING_TRANSACTION, data, &reply); - return reply.readInt32(); - } -}; - -IMPLEMENT_META_INTERFACE(InputFlinger, "android.input.IInputFlinger"); - - -status_t BnInputFlinger::onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { - switch(code) { - case DO_SOMETHING_TRANSACTION: { - CHECK_INTERFACE(IInputFlinger, data, reply); - reply->writeInt32(0); - break; - } - default: - return BBinder::onTransact(code, data, reply, flags); - } - return NO_ERROR; -} - -}; diff --git a/services/inputflinger/Android.mk b/services/inputflinger/Android.mk index 2edc07da1..85edbe5db 100644 --- a/services/inputflinger/Android.mk +++ b/services/inputflinger/Android.mk @@ -22,8 +22,7 @@ LOCAL_SRC_FILES:= \ InputListener.cpp \ InputManager.cpp \ InputReader.cpp \ - InputWindow.cpp \ - InputFlinger.cpp + InputWindow.cpp LOCAL_SHARED_LIBRARIES := \ libbinder \ @@ -49,19 +48,3 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_MODULE := libinputflinger include $(BUILD_SHARED_LIBRARY) - -######################################################################## -# build input flinger executable -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main.cpp - -LOCAL_SHARED_LIBRARIES := \ - libbinder \ - libinputflinger \ - libutils - -LOCAL_MODULE := inputflinger - -include $(BUILD_EXECUTABLE) diff --git a/services/inputflinger/InputFlinger.cpp b/services/inputflinger/InputFlinger.cpp deleted file mode 100644 index 9ea6ce584..000000000 --- a/services/inputflinger/InputFlinger.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "InputFlinger" - -#include "InputFlinger.h" - -#include -#include - -#include - -#include -#include -#include -#include - -namespace android { - -const String16 sAccessInputFlingerPermission("android.permission.ACCESS_INPUT_FLINGER"); -const String16 sDumpPermission("android.permission.DUMP"); - - -InputFlinger::InputFlinger() : - BnInputFlinger() { - ALOGI("InputFlinger is starting"); -} - -InputFlinger::~InputFlinger() { -} - -status_t InputFlinger::onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { - switch (code) { - case DO_SOMETHING_TRANSACTION: - const IPCThreadState* ipc = IPCThreadState::self(); - const int pid = ipc->getCallingPid(); - const int uid = ipc->getCallingUid(); - if (!PermissionCache::checkPermission(sAccessInputFlingerPermission, pid, uid)) { - ALOGE("Permission Denial: " - "can't access InputFlinger from pid=%d, uid=%d", pid, uid); - return PERMISSION_DENIED; - } - break; - } - - return BnInputFlinger::onTransact(code, data, reply, flags); -} - -status_t InputFlinger::dump(int fd, const Vector& args) { - String8 result; - const IPCThreadState* ipc = IPCThreadState::self(); - const int pid = ipc->getCallingPid(); - const int uid = ipc->getCallingUid(); - if ((uid != AID_SHELL) - && !PermissionCache::checkPermission(sDumpPermission, pid, uid)) { - result.appendFormat("Permission Denial: " - "can't dump SurfaceFlinger from pid=%d, uid=%d\n", pid, uid); - } else { - dumpInternal(result); - } - write(fd, result.string(), result.size()); - return OK; -} - -void InputFlinger::dumpInternal(String8& result) { - result.append("INPUT FLINGER (dumpsys inputflinger)\n"); - result.append("... nothing here yet...\n"); -} - -status_t InputFlinger::doSomething() { - ALOGI("Did something..."); - return OK; -} - -}; // namespace android diff --git a/services/inputflinger/InputFlinger.h b/services/inputflinger/InputFlinger.h deleted file mode 100644 index 731ab17e8..000000000 --- a/services/inputflinger/InputFlinger.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_INPUT_FLINGER_H -#define ANDROID_INPUT_FLINGER_H - -#include -#include - -#include -#include -#include -#include - -namespace android { - -class InputFlinger : public BnInputFlinger { -public: - static char const* getServiceName() ANDROID_API { - return "inputflinger"; - } - - InputFlinger() ANDROID_API; - - // IBinder interface - virtual status_t onTransact(uint32_t code, - const Parcel& data, Parcel* reply, uint32_t flags); - virtual status_t dump(int fd, const Vector& args); - - // IInputFlinger interface - virtual status_t doSomething(); - -private: - virtual ~InputFlinger(); - - void dumpInternal(String8& result); -}; - -} // namespace android - -#endif // ANDROID_INPUT_FLINGER_H diff --git a/services/inputflinger/main.cpp b/services/inputflinger/main.cpp deleted file mode 100644 index 0a517cc5d..000000000 --- a/services/inputflinger/main.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include "InputFlinger.h" - -using namespace android; - -int main(int, char**) { - ProcessState::self()->setThreadPoolMaxThreadCount(4); - BinderService::publishAndJoinThreadPool(true); - return 0; -}