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

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

Snap for 6284977 from 43176622 to mainline-release 

Change-Id: Ic19f54dd43db13652c5ed9bf60af5135b1f8598f
parents 76f2acb7 43176622

camera/aidl/android/hardware/ICameraServiceListener.aidl

+8 −0
Original line number Diff line number Diff line
@@ -89,4 +89,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
@@ -97,6 +97,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
@@ -101,6 +101,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);

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ class Codec2AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2AudioDecHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioEncTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ class Codec2AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2AudioEncHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {