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

Commit f4b214fc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11526283 from 38b856f7 to 24Q2-release 

Change-Id: Ieba4c774d2b2ca0e71a46409521482115618f830
parents 5cac97ee 38b856f7

services/audioflinger/Tracks.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ status_t Track::start(AudioSystem::sync_event_t event __unused, 
                && (state == IDLE || state == STOPPED || state == FLUSHED)) {

            mFrameMap.reset();



            if (!isFastTrack() && (isDirect() || isOffloaded())) {

            if (!isFastTrack()) {

                // Start point of track -> sink frame map. If the HAL returns a

                // frame position smaller than the first written frame in

                // updateTrackFrameInfo, the timestamp can be interpolated

services/camera/virtualcamera/flags/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -35,3 +35,27 @@ cc_library_static { 
    export_include_dirs: ["."],

    defaults: ["virtual_device_build_flags_defaults"],

}



soong_config_module_type {

    name: "virtual_device_build_flags_java_library",

    module_type: "java_library",

    config_namespace: "vdm",

    bool_variables: [

        "virtual_camera_service_enabled",

    ],

    properties: [

        "srcs",

    ],

}



virtual_device_build_flags_java_library {

    name: "virtual_device_build_flag_java",

    soong_config_variables: {

        virtual_camera_service_enabled: {

            srcs: ["java/enabled/**/*.java"],

            conditions_default: {

                srcs: ["java/disabled/**/*.java"],

            },

        },

    },

}

services/camera/virtualcamera/flags/java/disabled/android/companion/virtualdevice/flags/VirtualCameraServiceBuildFlag.java

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.companion.virtualdevice.flags;



/** This file is included only if RELEASE_PACKAGE_VIRTUAL_CAMERA build flag isn't set.*/

public class VirtualCameraServiceBuildFlag {



    public static boolean isVirtualCameraServiceBuildFlagEnabled() {

        return false;

    }

}

services/camera/virtualcamera/flags/java/enabled/android/companion/virtualdevice/flags/VirtualCameraServiceBuildFlag.java

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.companion.virtualdevice.flags;



/** This file is included only if RELEASE_PACKAGE_VIRTUAL_CAMERA build flag is set.*/

public class VirtualCameraServiceBuildFlag {



    public static boolean isVirtualCameraServiceBuildFlagEnabled() {

        return true;

    }

}