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

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

Snap for 7384269 from 1ba66b4f to sc-d1-release 

Change-Id: I4a0b48bbd4e098059313cb1f77169c5d71bfa266
parents 4b54daa7 1ba66b4f

camera/aidl/android/hardware/ICameraService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ interface ICameraService 
            String cameraId,

            String opPackageName,

            @nullable String featureId,

            int clientUid);

            int clientUid, int oomScoreOffset);



    /**

     * Add listener for changes to camera device and flashlight state.

camera/ndk/impl/ACameraManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ ACameraManager::openCamera( 
    // Send a zero length package name and let camera service figure it out from UID

    binder::Status serviceRet = cs->connectDevice(

            callbacks, String16(cameraId), String16(""), {},

            hardware::ICameraService::USE_CALLING_UID, /*out*/&deviceRemote);

            hardware::ICameraService::USE_CALLING_UID, /*oomScoreOffset*/0, /*out*/&deviceRemote);



    if (!serviceRet.isOk()) {

        ALOGE("%s: connect camera device failed: %s", __FUNCTION__, serviceRet.toString8().string());

camera/tests/CameraBinderTests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ TEST(CameraServiceBinderTest, CheckBinderCameraService) { 
        sp<TestCameraDeviceCallbacks> callbacks(new TestCameraDeviceCallbacks());

        sp<hardware::camera2::ICameraDeviceUser> device;

        res = service->connectDevice(callbacks, cameraId, String16("meeeeeeeee!"),

                {}, hardware::ICameraService::USE_CALLING_UID,

                {}, hardware::ICameraService::USE_CALLING_UID, /*oomScoreOffset*/ 0,

                /*out*/&device);

        EXPECT_TRUE(res.isOk()) << res;

        ASSERT_NE(nullptr, device.get());
@@ -421,7 +421,7 @@ protected: 
        {

            SCOPED_TRACE("openNewDevice");

            binder::Status res = service->connectDevice(callbacks, deviceId, String16("meeeeeeeee!"),

                    {}, hardware::ICameraService::USE_CALLING_UID,

                    {}, hardware::ICameraService::USE_CALLING_UID, /*oomScoreOffset*/ 0,

                    /*out*/&device);

            EXPECT_TRUE(res.isOk()) << res;

        }

media/libaaudio/include/aaudio/AAudio.h

+3 −2
Original line number Diff line number Diff line
@@ -635,13 +635,14 @@ AAUDIO_API aaudio_result_t AAudio_createStreamBuilder(AAudioStreamBuilder** buil 
AAUDIO_API void AAudioStreamBuilder_setDeviceId(AAudioStreamBuilder* builder,

                                                int32_t deviceId) __INTRODUCED_IN(26);



// TODO b/182392769: reexamine if Identity can be used

/**

 * Declare the name of the package creating the stream.

 *

 * This is usually {@code Context#getPackageName()}.

 *

 * The default, if you do not call this function, is a random package in the calling uid.

 * The vast majority of apps have only one package per calling UID. If the package

 * name does not match the calling UID, then requests will be rejected.

 *

 * Available since API level 31.

 *
@@ -656,7 +657,7 @@ AAUDIO_API void AAudioStreamBuilder_setPackageName(AAudioStreamBuilder* builder, 
 *

 * This is usually {@code Context#getAttributionTag()}.

 *

 * The default, if you do not call this function, is the default attribution tag.

 * The default, if you do not call this function, is null.

 *

 * Available since API level 31.

 *

services/audiopolicy/enginedefault/src/Engine.cpp

+4 −2
Original line number Diff line number Diff line
@@ -187,8 +187,10 @@ void Engine::filterOutputDevicesForStrategy(legacy_strategy strategy, 
                availableOutputDevices = availPrimaryOutputDevices;

            }



        }

        // Do not use A2DP devices when in call but use them when not in call

        // (e.g for voice mail playback)

        if (isInCall()) {

            availableOutputDevices.remove(availableOutputDevices.getDevicesFromTypes({

                    AUDIO_DEVICE_OUT_BLUETOOTH_A2DP, AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,

                    AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER, }));