787ac1b388
until now we were tracking when a sensors was physically enabled or disabled and we were reporting that to the BattaryService. this wasn incorrect because we could have several different apps enabling the same sensor, so the accounting by the battery service would be incorrect in that case (depending on the order in which these apps disabled said sensor). BatteryService tracks sensors per uid, however SensorService does this per binder connection, so we could have several binder connections for the same uid, to solve this we keep a list of sensor/uid -> count, which is the bulk of this change. Bug: 6661604 Change-Id: I561c198c42ba1736a8671bdacda4c76d72b9dd6f
72 lines
2.3 KiB
C++
72 lines
2.3 KiB
C++
/*
|
|
* Copyright (C) 2012 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 <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <utils/Singleton.h>
|
|
|
|
namespace android {
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class BatteryService : public Singleton<BatteryService> {
|
|
static const int TRANSACTION_noteStartSensor = IBinder::FIRST_CALL_TRANSACTION + 3;
|
|
static const int TRANSACTION_noteStopSensor = IBinder::FIRST_CALL_TRANSACTION + 4;
|
|
static const String16 DESCRIPTOR;
|
|
|
|
friend class Singleton<BatteryService>;
|
|
sp<IBinder> mBatteryStatService;
|
|
|
|
BatteryService();
|
|
status_t noteStartSensor(int uid, int handle);
|
|
status_t noteStopSensor(int uid, int handle);
|
|
|
|
void enableSensorImpl(uid_t uid, int handle);
|
|
void disableSensorImpl(uid_t uid, int handle);
|
|
void cleanupImpl(uid_t uid);
|
|
|
|
struct Info {
|
|
uid_t uid;
|
|
int handle;
|
|
int32_t count;
|
|
Info() : uid(0), handle(0), count(0) { }
|
|
Info(uid_t uid, int handle) : uid(uid), handle(handle), count(0) { }
|
|
bool operator < (const Info& rhs) const {
|
|
return (uid == rhs.uid) ? (handle < rhs.handle) : (uid < rhs.uid);
|
|
}
|
|
};
|
|
|
|
Mutex mActivationsLock;
|
|
SortedVector<Info> mActivations;
|
|
bool addSensor(uid_t uid, int handle);
|
|
bool removeSensor(uid_t uid, int handle);
|
|
|
|
public:
|
|
static void enableSensor(uid_t uid, int handle) {
|
|
BatteryService::getInstance().enableSensorImpl(uid, handle);
|
|
}
|
|
static void disableSensor(uid_t uid, int handle) {
|
|
BatteryService::getInstance().disableSensorImpl(uid, handle);
|
|
}
|
|
static void cleanup(uid_t uid) {
|
|
BatteryService::getInstance().cleanupImpl(uid);
|
|
}
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|
|
|