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

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

Snap for 11456215 from 2f7e10ff to 24Q2-release 

Change-Id: I9ef41a6ba05460f994a9ce26f04ac8806d4f4771
parents 50083204 2f7e10ff

camera/Android.bp

+10 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_camera_framework",

    default_applicable_licenses: ["frameworks_av_camera_license"],

}
@@ -65,6 +66,7 @@ cc_library_headers { 
    name: "camera_headers",

    export_include_dirs: ["include"],

}



cc_library {

    name: "libcamera_client",
@@ -121,9 +123,13 @@ cc_library { 
    ],

    export_include_dirs: [

        "include",

         "include/camera"

        "include/camera",

    ],

    export_shared_lib_headers: [

        "libcamera_metadata",

        "libnativewindow",

        "libgui",

    ],

    export_shared_lib_headers: ["libcamera_metadata", "libnativewindow", "libgui"],



    cflags: [

        "-Werror",
@@ -153,7 +159,7 @@ cc_library_host_static { 


    export_include_dirs: [

        "include",

        "include/camera"

        "include/camera",

    ],

}

camera/camera_platform.aconfig

+14 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ flag { 
     bug: "309627704"

}



flag {

     namespace: "camera_platform"

     name: "watch_foreground_changes"

     description: "Request AppOps to notify changes in the foreground status of the client"

     bug: "290086710"

}



flag {

     namespace: "camera_platform"

     name: "log_ultrawide_usage"
@@ -119,3 +126,10 @@ flag { 
     description: "Allowlisting to exempt safety-relevant cameras from privacy control for automotive devices"

     bug: "282814430"

}



flag {

     namespace: "camera_platform"

     name: "extension_10_bit"

     description: "Enables 10-bit support in the camera extensions."

     bug: "316375635"

}

camera/cameraserver/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_camera_framework",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_av_camera_license"

camera/ndk/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
// frameworks/av/include.



package {

    default_team: "trendy_team_camera_framework",

    default_applicable_licenses: ["frameworks_av_camera_ndk_license"],

}

camera/ndk/impl/ACameraManager.cpp

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ void CameraManagerGlobal::drainPendingCallbacksLocked() { 
template<class T>

void CameraManagerGlobal::registerAvailCallback(const T *callback) {

    Mutex::Autolock _l(mLock);

    getCameraServiceLocked();

    Callback cb(callback);

    auto pair = mCallbacks.insert(cb);

    // Send initial callbacks if callback is newly registered