Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022f0cb0 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

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
parent 4a95e694

services/camera/libcameraservice/CameraService.cpp

+5 −1
Original line number Diff line number Diff line
@@ -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();