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

Commit a1350e74 authored by Devin Moore's avatar Devin Moore
Browse files

Deprecate HIDL cameraservice 

This prevents the HIDL cameraservice from being registered after FCM
level 7.
Demote the error message to a warning when the HIDL cameraservice fails
to register.

Test: boot cuttlefish and verify no HIDL cameraservice and no crash in
cameraserver.
Bug: 205764761

Change-Id: I786c2ed74d272a9546d2acd901cc2159243c603a
parent e1a63de6

camera/cameraserver/manifest_android.frameworks.cameraservice.service.xml

+1 −1
Original line number Diff line number Diff line 
<manifest version="1.0" type="framework">

    <hal>

    <hal format="hidl" max-level="7">

        <name>android.frameworks.cameraservice.service</name>

        <transport>hwbinder</transport>

        <version>2.2</version>

services/camera/libcameraservice/CameraService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ void CameraService::onFirstRef() 
    mAppOps.setCameraAudioRestriction(mAudioRestriction);

    sp<HidlCameraService> hcs = HidlCameraService::getInstance(this);

    if (hcs->registerAsService() != android::OK) {

        ALOGE("%s: Failed to register default android.frameworks.cameraservice.service@1.0",

        // Deprecated, so it will fail to register on newer devices

        ALOGW("%s: Did not register default android.frameworks.cameraservice.service@2.2",

              __FUNCTION__);

    }