am 4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev

* commit '4904821b212a3ee91f22a51295f86f6339cbcc8d':
  Rename wakelock held internally by SensorService.
This commit is contained in:
Aravind Akella 2015-07-13 23:02:20 +00:00 committed by Android Git Automerger
commit a4864d61dc

View File

@ -64,7 +64,7 @@ namespace android {
* *
*/ */
const char* SensorService::WAKE_LOCK_NAME = "SensorService"; const char* SensorService::WAKE_LOCK_NAME = "SensorService_wakelock";
// Permissions. // Permissions.
static const String16 sDump("android.permission.DUMP"); static const String16 sDump("android.permission.DUMP");
@ -1379,7 +1379,7 @@ void SensorService::SensorEventConnection::resetWakeLockRefCount() {
void SensorService::SensorEventConnection::dump(String8& result) { void SensorService::SensorEventConnection::dump(String8& result) {
Mutex::Autolock _l(mConnectionLock); Mutex::Autolock _l(mConnectionLock);
result.appendFormat("Operating Mode: %s\n", mDataInjectionMode ? "DATA_INJECTION" : "NORMAL"); result.appendFormat("\tOperating Mode: %s\n",mDataInjectionMode ? "DATA_INJECTION" : "NORMAL");
result.appendFormat("\t %s | WakeLockRefCount %d | uid %d | cache size %d | " result.appendFormat("\t %s | WakeLockRefCount %d | uid %d | cache size %d | "
"max cache size %d\n", mPackageName.string(), mWakeLockRefCount, mUid, mCacheSize, "max cache size %d\n", mPackageName.string(), mWakeLockRefCount, mUid, mCacheSize,
mMaxCacheSize); mMaxCacheSize);