diff options
author | Jeff Brown <jeffbrown@google.com> | 2013-08-22 18:34:33 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2013-08-22 18:40:07 -0700 |
commit | 464febc44908fb4a8fca9e513ba8469750dde838 (patch) | |
tree | 2b313eb1b04d72cd95ada4ee0ef3f46c576fff21 /services | |
parent | 39bfc6989259c5d24fd43f3d7fa7e967a4b17aac (diff) | |
download | frameworks_native-464febc44908fb4a8fca9e513ba8469750dde838.zip frameworks_native-464febc44908fb4a8fca9e513ba8469750dde838.tar.gz frameworks_native-464febc44908fb4a8fca9e513ba8469750dde838.tar.bz2 |
Remove input flinger stubs. (DO NOT MERGE)
Bug: 10446930
Change-Id: I4dd46f539cd2a2e324dfc83b45ba2787f7404a4a
Diffstat (limited to 'services')
-rw-r--r-- | services/inputflinger/Android.mk | 50 | ||||
-rw-r--r-- | services/inputflinger/InputFlinger.cpp | 89 | ||||
-rw-r--r-- | services/inputflinger/InputFlinger.h | 54 | ||||
-rw-r--r-- | services/inputflinger/main.cpp | 26 |
4 files changed, 0 insertions, 219 deletions
diff --git a/services/inputflinger/Android.mk b/services/inputflinger/Android.mk deleted file mode 100644 index e32d38a..0000000 --- a/services/inputflinger/Android.mk +++ /dev/null @@ -1,50 +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. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - InputFlinger.cpp - -LOCAL_SHARED_LIBRARIES := \ - libbinder \ - libcutils \ - libinput \ - liblog \ - libutils - -LOCAL_CFLAGS += -fvisibility=hidden - -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 9ea6ce5..0000000 --- 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 <stdint.h> -#include <unistd.h> - -#include <sys/types.h> - -#include <binder/IPCThreadState.h> -#include <binder/PermissionCache.h> -#include <cutils/log.h> -#include <private/android_filesystem_config.h> - -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<String16>& 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 731ab17..0000000 --- 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 <stdint.h> -#include <sys/types.h> - -#include <cutils/compiler.h> -#include <input/IInputFlinger.h> -#include <utils/String8.h> -#include <utils/String16.h> - -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<String16>& 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 3209a62..0000000 --- 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 <binder/BinderService.h> -#include "InputFlinger.h" - -using namespace android; - -int main(int argc, char** argv) { - ProcessState::self()->setThreadPoolMaxThreadCount(4); - BinderService<InputFlinger>::publishAndJoinThreadPool(true); - return 0; -} |