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

Commit e7aa034b authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Fix onCameraOpened/onCameraClosed callback 

Add client package id in the CameraStatus interface, so that
addListener will return the currently opened cameras if the
client has the permission.

Bug: 193475498
Test: testCameraManagerListenerCallbacks
Change-Id: Ic78b80526c3f55a450caa54e27c3d36265b127b9
parent f9b5b733

camera/CameraBase.cpp

+9 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ status_t CameraStatus::writeToParcel(android::Parcel* parcel) const { 
        unavailablePhysicalIds16.push_back(String16(id8));

    }

    res = parcel->writeString16Vector(unavailablePhysicalIds16);

    if (res != OK) return res;



    res = parcel->writeString16(String16(clientPackage));

    return res;

}
@@ -86,6 +89,12 @@ status_t CameraStatus::readFromParcel(const android::Parcel* parcel) { 
    for (auto& id16 : unavailablePhysicalIds16) {

        unavailablePhysicalIds.push_back(String8(id16));

    }



    String16 tempClientPackage;

    res = parcel->readString16(&tempClientPackage);

    if (res != OK) return res;

    clientPackage = String8(tempClientPackage);



    return res;

}

camera/include/camera/CameraBase.h

+8 −2
Original line number Diff line number Diff line
@@ -85,11 +85,17 @@ struct CameraStatus : public android::Parcelable { 
     */

    std::vector<String8> unavailablePhysicalIds;



    /**

     * Client package name if camera is open, otherwise not applicable

     */

    String8 clientPackage;



    virtual status_t writeToParcel(android::Parcel* parcel) const;

    virtual status_t readFromParcel(const android::Parcel* parcel);



    CameraStatus(String8 id, int32_t s, const std::vector<String8>& unavailSubIds) :

            cameraId(id), status(s), unavailablePhysicalIds(unavailSubIds) {}

    CameraStatus(String8 id, int32_t s, const std::vector<String8>& unavailSubIds,

            const String8& clientPkg) : cameraId(id), status(s),

            unavailablePhysicalIds(unavailSubIds), clientPackage(clientPkg) {}

    CameraStatus() : status(ICameraServiceListener::STATUS_PRESENT) {}

};

services/camera/libcameraservice/CameraService.cpp

+24 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,8 @@ Status CameraService::addListenerHelper(const sp<ICameraServiceListener>& listen 
        Mutex::Autolock lock(mCameraStatesLock);

        for (auto& i : mCameraStates) {

            cameraStatuses->emplace_back(i.first,

                    mapToInterface(i.second->getStatus()), i.second->getUnavailablePhysicalIds());

                    mapToInterface(i.second->getStatus()), i.second->getUnavailablePhysicalIds(),

                    openCloseCallbackAllowed ? i.second->getClientPackage() : String8::empty());

        }

    }

    // Remove the camera statuses that should be hidden from the client, we do
@@ -3721,6 +3722,16 @@ bool CameraService::CameraState::removeUnavailablePhysicalId(const String8& phys 
    return count > 0;

}



void CameraService::CameraState::setClientPackage(const String8& clientPackage) {

    Mutex::Autolock lock(mStatusLock);

    mClientPackage = clientPackage;

}



String8 CameraService::CameraState::getClientPackage() const {

    Mutex::Autolock lock(mStatusLock);

    return mClientPackage;

}



// ----------------------------------------------------------------------------

//                  ClientEventListener

// ----------------------------------------------------------------------------
@@ -4284,6 +4295,18 @@ void CameraService::updateStatus(StatusInternal status, const String8& cameraId, 


void CameraService::updateOpenCloseStatus(const String8& cameraId, bool open,

        const String16& clientPackageName) {

    auto state = getCameraState(cameraId);

    if (state == nullptr) {

        ALOGW("%s: Could not update the status for %s, no such device exists", __FUNCTION__,

                cameraId.string());

        return;

    }

    if (open) {

        state->setClientPackage(String8(clientPackageName));

    } else {

        state->setClientPackage(String8::empty());

    }



    Mutex::Autolock lock(mStatusListenerLock);



    for (const auto& it : mListenerList) {

services/camera/libcameraservice/CameraService.h

+7 −0
Original line number Diff line number Diff line
@@ -631,6 +631,12 @@ private: 
        bool addUnavailablePhysicalId(const String8& physicalId);

        bool removeUnavailablePhysicalId(const String8& physicalId);



        /**

         * Set and get client package name.

         */

        void setClientPackage(const String8& clientPackage);

        String8 getClientPackage() const;



        /**

         * Return the unavailable physical ids for this device.

         *
@@ -643,6 +649,7 @@ private: 
        const int mCost;

        std::set<String8> mConflicting;

        std::set<String8> mUnavailablePhysicalIds;

        String8 mClientPackage;

        mutable Mutex mStatusLock;

        CameraParameters mShimParams;

        const SystemCameraKind mSystemCameraKind;