diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2015-05-19 16:31:16 -0700 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2015-05-19 16:31:16 -0700 |
commit | 022f0cb0c6f135edde4ebe84859c685933ee895e (patch) | |
tree | 938b6389523d0afeb02acf7904ce067869718a6c /services/camera/libcameraservice/CameraService.cpp | |
parent | 4a95e69406aa2e9896d865962d6d947ebbdac6fc (diff) | |
download | frameworks_av-022f0cb0c6f135edde4ebe84859c685933ee895e.zip frameworks_av-022f0cb0c6f135edde4ebe84859c685933ee895e.tar.gz frameworks_av-022f0cb0c6f135edde4ebe84859c685933ee895e.tar.bz2 |
CameraService: Logcat conflicting devices on rejected open
Already in dumpsys log, but also put into logcat for feedback reports
Also fix a minor warning about an uninitialized variable.
Bug: 21063372
Change-Id: I04b45932e4500ac72aaa1cb724abc8a82a0e70e8
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index fc9a332..82aa566 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -959,6 +959,10 @@ status_t CameraService::handleEvictionsLocked(const String8& cameraId, int clien "(PID %" PRId32 ", priority %" PRId32 ")", i->getKey().string(), String8{i->getValue()->getPackageName()}.string(), i->getOwnerId(), i->getPriority()); + ALOGE(" Conflicts with: Device %s, client package %s (PID %" + PRId32 ", priority %" PRId32 ")", i->getKey().string(), + String8{i->getValue()->getPackageName()}.string(), i->getOwnerId(), + i->getPriority()); } // Log the client's attempt @@ -1975,7 +1979,7 @@ String8 CameraService::CameraClientManager::toString() const { auto conflicting = i->getConflicting(); auto clientSp = i->getValue(); String8 packageName; - userid_t clientUserId; + userid_t clientUserId = 0; if (clientSp.get() != nullptr) { packageName = String8{clientSp->getPackageName()}; uid_t clientUid = clientSp->getClientUid(); |