summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-03-28 13:57:51 -0700
committerColin Cross <ccross@android.com>2012-03-28 13:57:51 -0700
commit4be004163071d550d72389ea1772bf6a6f95d345 (patch)
treed874d69c8050db4f87147c8010bc30dc5ba72736 /include
parenta00377682123de4d55927f097feffe885330451d (diff)
downloadframeworks_base-4be004163071d550d72389ea1772bf6a6f95d345.zip
frameworks_base-4be004163071d550d72389ea1772bf6a6f95d345.tar.gz
frameworks_base-4be004163071d550d72389ea1772bf6a6f95d345.tar.bz2
Move services/powermanager from frameworks/base to frameworks/native
Move services/powermanager into frameworks/native so audioflinger can use it. Note that this is not the same as a PowerManagerService, which is part of systemserver and handles turning the screen on and off, etc. This is just a binder interface to allow taking wakelocks. Change-Id: I1142e6d9ddbb651cc19ac07d946fa24d8feed8a3
Diffstat (limited to 'include')
-rw-r--r--include/powermanager/IPowerManager.h41
-rw-r--r--include/powermanager/PowerManager.h29
2 files changed, 0 insertions, 70 deletions
diff --git a/include/powermanager/IPowerManager.h b/include/powermanager/IPowerManager.h
deleted file mode 100644
index 1723f04..0000000
--- a/include/powermanager/IPowerManager.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2011 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_IPOWERMANAGER_H
-#define ANDROID_IPOWERMANAGER_H
-
-#include <utils/Errors.h>
-#include <binder/IInterface.h>
-
-namespace android {
-
-// ----------------------------------------------------------------------------
-
-// must be kept in sync with interface defined in IPowerManager.aidl
-class IPowerManager : public IInterface
-{
-public:
- DECLARE_META_INTERFACE(PowerManager);
-
- virtual status_t acquireWakeLock(int flags, const sp<IBinder>& lock, const String16& tag) = 0;
- virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags) = 0;
-};
-
-// ----------------------------------------------------------------------------
-
-}; // namespace android
-
-#endif // ANDROID_IPOWERMANAGER_H
diff --git a/include/powermanager/PowerManager.h b/include/powermanager/PowerManager.h
deleted file mode 100644
index 4590174..0000000
--- a/include/powermanager/PowerManager.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011 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_POWERMANAGER_H
-#define ANDROID_POWERMANAGER_H
-
-namespace android {
-
-// must be kept in sync with definitions in PowerManager.java
-enum {
- POWERMANAGER_PARTIAL_WAKE_LOCK = 1, // equals PowerManager.PARTIAL_WAKE_LOCK constant
-};
-
-}; // namespace android
-
-#endif // ANDROID_POWERMANAGER_H