diff options
| author | Aravind Akella <aakella@google.com> | 2015-07-13 18:21:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-13 18:21:49 +0000 |
| commit | 4904821b212a3ee91f22a51295f86f6339cbcc8d (patch) | |
| tree | 85670bb9d8a5afe2b8617db82269146542e923de | |
| parent | 982719b179aecc33aa6c258318fcbf6e4faa81d7 (diff) | |
| parent | 8ef3c89eb2030395f8a342bd16dbb344957ab275 (diff) | |
| download | frameworks_native-4904821b212a3ee91f22a51295f86f6339cbcc8d.zip frameworks_native-4904821b212a3ee91f22a51295f86f6339cbcc8d.tar.gz frameworks_native-4904821b212a3ee91f22a51295f86f6339cbcc8d.tar.bz2 | |
Merge "Rename wakelock held internally by SensorService." into mnc-dev
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 71aa160..bb2d4f3 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -64,7 +64,7 @@ namespace android { * */ -const char* SensorService::WAKE_LOCK_NAME = "SensorService"; +const char* SensorService::WAKE_LOCK_NAME = "SensorService_wakelock"; // Permissions. static const String16 sDump("android.permission.DUMP"); @@ -1379,7 +1379,7 @@ void SensorService::SensorEventConnection::resetWakeLockRefCount() { void SensorService::SensorEventConnection::dump(String8& result) { 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 | " "max cache size %d\n", mPackageName.string(), mWakeLockRefCount, mUid, mCacheSize, mMaxCacheSize); |