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

Commit 542a0079 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6285821 from 67110b51 to qt-qpr3-release 

Change-Id: Id7b8ee5895fd71afe75c66d5eecbc55f7c189b3e
parents fa22b054 67110b51

camera/aidl/android/hardware/ICameraServiceListener.aidl

+8 −0
Original line number Diff line number Diff line
@@ -83,4 +83,12 @@ interface ICameraServiceListener 
     * can retry after receiving this callback.

     */

    oneway void onCameraAccessPrioritiesChanged();



    /**

     * Notify registered clients about cameras being opened/closed.

     * Only clients with android.permission.CAMERA_OPEN_CLOSE_LISTENER permission

     * will receive such callbacks.

     */

    oneway void onCameraOpened(String cameraId, String clientPackageId);

    oneway void onCameraClosed(String cameraId);

}

camera/ndk/impl/ACameraManager.h

+6 −0
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ class CameraManagerGlobal final : public RefBase { 
        }



        virtual binder::Status onCameraAccessPrioritiesChanged();

        virtual binder::Status onCameraOpened(const String16&, const String16&) {

            return binder::Status::ok();

        }

        virtual binder::Status onCameraClosed(const String16&) {

            return binder::Status::ok();

        }



      private:

        const wp<CameraManagerGlobal> mCameraManager;

camera/tests/CameraBinderTests.cpp

+11 −0
Original line number Diff line number Diff line
@@ -95,6 +95,17 @@ public: 
        return binder::Status::ok();

    }



    virtual binder::Status onCameraOpened(const String16& /*cameraId*/,

            const String16& /*clientPackageName*/) {

        // No op

        return binder::Status::ok();

    }



    virtual binder::Status onCameraClosed(const String16& /*cameraId*/) {

        // No op

        return binder::Status::ok();

    }



    bool waitForNumCameras(size_t num) const {

        Mutex::Autolock l(mLock);

drm/mediadrm/plugins/clearkey/default/InitDataParser.cpp

+17 −6
Original line number Diff line number Diff line
@@ -76,10 +76,21 @@ android::status_t InitDataParser::parse(const Vector<uint8_t>& initData, 


android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData,

        Vector<const uint8_t*>* keyIds) {

    // Description of PSSH format:

    // https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html

    size_t readPosition = 0;



    // Validate size field

    uint32_t expectedSize = initData.size();

    const char psshIdentifier[4] = {'p', 's', 's', 'h'};

    const uint8_t psshVersion1[4] = {1, 0, 0, 0};

    uint32_t keyIdCount = 0;

    size_t headerSize = sizeof(expectedSize) + sizeof(psshIdentifier) +

                        sizeof(psshVersion1) + kSystemIdSize + sizeof(keyIdCount);

    if (initData.size() < headerSize) {

        return android::ERROR_DRM_CANNOT_HANDLE;

    }



    // Validate size field

    expectedSize = htonl(expectedSize);

    if (memcmp(&initData[readPosition], &expectedSize,

               sizeof(expectedSize)) != 0) {
@@ -88,7 +99,6 @@ android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData, 
    readPosition += sizeof(expectedSize);



    // Validate PSSH box identifier

    const char psshIdentifier[4] = {'p', 's', 's', 'h'};

    if (memcmp(&initData[readPosition], psshIdentifier,

               sizeof(psshIdentifier)) != 0) {

        return android::ERROR_DRM_CANNOT_HANDLE;
@@ -96,7 +106,6 @@ android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData, 
    readPosition += sizeof(psshIdentifier);



    // Validate EME version number

    const uint8_t psshVersion1[4] = {1, 0, 0, 0};

    if (memcmp(&initData[readPosition], psshVersion1,

               sizeof(psshVersion1)) != 0) {

        return android::ERROR_DRM_CANNOT_HANDLE;
@@ -110,12 +119,14 @@ android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData, 
    readPosition += kSystemIdSize;



    // Read key ID count

    uint32_t keyIdCount;

    memcpy(&keyIdCount, &initData[readPosition], sizeof(keyIdCount));

    keyIdCount = ntohl(keyIdCount);

    readPosition += sizeof(keyIdCount);

    if (readPosition + ((uint64_t)keyIdCount * kKeyIdSize) !=

            initData.size() - sizeof(uint32_t)) {



    uint64_t psshSize = 0;

    if (__builtin_mul_overflow(keyIdCount, kKeyIdSize, &psshSize) ||

        __builtin_add_overflow(readPosition, psshSize, &psshSize) ||

        psshSize != initData.size() - sizeof(uint32_t) /* DataSize(0) */) {

        return android::ERROR_DRM_CANNOT_HANDLE;

    }

services/camera/libcameraservice/CameraService.cpp

+36 −1
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ static void setLogLevel(int level) { 
// ----------------------------------------------------------------------------



static const String16 sManageCameraPermission("android.permission.MANAGE_CAMERA");

static const String16 sCameraOpenCloseListenerPermission(

        "android.permission.CAMERA_OPEN_CLOSE_LISTENER");



// Matches with PERCEPTIBLE_APP_ADJ in ProcessList.java

static constexpr int32_t kVendorClientScore = 200;
@@ -1811,7 +1813,11 @@ Status CameraService::addListenerHelper(const sp<ICameraServiceListener>& listen 
        }



        auto clientUid = CameraThreadState::getCallingUid();

        sp<ServiceListener> serviceListener = new ServiceListener(this, listener, clientUid);

        auto clientPid = CameraThreadState::getCallingPid();

        bool openCloseCallbackAllowed = checkPermission(sCameraOpenCloseListenerPermission,

                clientPid, clientUid);

        sp<ServiceListener> serviceListener = new ServiceListener(this, listener,

                clientUid, clientPid, openCloseCallbackAllowed);

        auto ret = serviceListener->initialize();

        if (ret != NO_ERROR) {

            String8 msg = String8::format("Failed to initialize service listener: %s (%d)",
@@ -2515,6 +2521,9 @@ status_t CameraService::BasicClient::startCameraOps() { 


    sCameraService->mUidPolicy->registerMonitorUid(mClientUid);



    // Notify listeners of camera open/close status

    sCameraService->updateOpenCloseStatus(mCameraIdStr, true/*open*/, mClientPackageName);



    return OK;

}
@@ -2555,6 +2564,9 @@ status_t CameraService::BasicClient::finishCameraOps() { 


    sCameraService->mUidPolicy->unregisterMonitorUid(mClientUid);



    // Notify listeners of camera open/close status

    sCameraService->updateOpenCloseStatus(mCameraIdStr, false/*open*/, mClientPackageName);



    return OK;

}
@@ -3311,6 +3323,29 @@ void CameraService::updateStatus(StatusInternal status, const String8& cameraId, 
        });

}



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

        const String16& clientPackageName) {

    Mutex::Autolock lock(mStatusListenerLock);



    for (const auto& it : mListenerList) {

        if (!it.second->isOpenCloseCallbackAllowed()) {

            continue;

        }



        binder::Status ret;

        String16 cameraId64(cameraId);

        if (open) {

            ret = it.second->getListener()->onCameraOpened(cameraId64, clientPackageName);

        } else {

            ret = it.second->getListener()->onCameraClosed(cameraId64);

        }

        if (!ret.isOk()) {

            ALOGE("%s: Failed to trigger onCameraOpened/onCameraClosed callback: %d", __FUNCTION__,

                    ret.exceptionCode());

        }

    }

}



template<class Func>

void CameraService::CameraState::updateStatus(StatusInternal status,

        const String8& cameraId,