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

Commit b77c91c9 authored by Xin Li's avatar Xin Li
Browse files

Merge SP1A.210812.016 

Merged-In: I6b83b5a30b2768b45d2982e7978aaf6a9d892c40
Change-Id: I96ac522bf222af378ec1d775b5a84bb1396676a0
parents f13ee0d0 28c00563

camera/ndk/include/camera/NdkCameraMetadataTags.h

+6 −1
Original line number Diff line number Diff line
@@ -9005,7 +9005,12 @@ typedef enum acamera_metadata_enum_acamera_request_available_capabilities { 
     * <code>android.scaler.streamConfigurationMap</code> describes the streams supported in 'default'

     * mode.

     * The stream configurations supported in 'max resolution' mode are described by

     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.</p>

     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.

     * The maximum resolution mode pixel array size of a camera device

     * (<code>ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE</code>) with this capability,

     * will be at least 24 megapixels.</p>

     *

     * @see ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE

     */

    ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR

                                                                      = 16,

drm/libdrmframework/DrmManagerClientImpl.cpp

+1 −3
Original line number Diff line number Diff line
@@ -53,10 +53,8 @@ const sp<IDrmManagerService>& DrmManagerClientImpl::getDrmManagerService() { 
    Mutex::Autolock lock(sMutex);

    if (NULL == sDrmManagerService.get()) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder = sm->getService(String16("drm.drmManager"));

        sp<IBinder> binder = sm->checkService(String16("drm.drmManager"));

        if (binder == NULL) {

            // Do NOT retry; IServiceManager already waits for ~5 seconds

            // in getService if a service doesn't yet exist.

            return sDrmManagerService;

        }

        if (NULL == sDeathNotifier.get()) {