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

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

Snap for 6081300 from 94e872e6 to rvc-release 

Change-Id: I4c7b65bfcd30c101244bb5d317d0a5a15d3dd0f7
parents 09c138c1 94e872e6

camera/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ filegroup { 
        "aidl/android/hardware/ICameraServiceProxy.aidl",

        "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",

        "aidl/android/hardware/camera2/ICameraDeviceUser.aidl",

        "aidl/android/hardware/camera2/ICameraOfflineSession.aidl",

    ],

    path: "aidl",

}

camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package android.hardware.camera2;



import android.hardware.camera2.CaptureRequest;

import android.hardware.camera2.ICameraDeviceCallbacks;

import android.hardware.camera2.ICameraOfflineSession;

import android.hardware.camera2.impl.CameraMetadataNative;

import android.hardware.camera2.params.OutputConfiguration;

import android.hardware.camera2.params.SessionConfiguration;
@@ -177,4 +179,15 @@ interface ICameraDeviceUser 
      * @return the currently applied system-wide audio restriction mode

      */

    int getGlobalAudioRestriction();



    /**

     * Offline processing main entry point

     *

     * @param callbacks Object that will receive callbacks from offline session

     * @param offlineOutputIds The ID of streams that needs to be preserved in offline session

     *

     * @return Offline session object.

     */

    ICameraOfflineSession switchToOffline(in ICameraDeviceCallbacks callbacks,

            in Surface[] offlineOutputs);

}

camera/aidl/android/hardware/camera2/ICameraOfflineSession.aidl

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

 * Copyright (C) 2019 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.hardware.camera2;



 /** @hide */

interface ICameraOfflineSession

{

    void disconnect();

}

camera/ndk/include/camera/NdkCameraMetadataTags.h

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ typedef enum acamera_metadata_tag { 
    /**

     * <p>List of the maximum number of regions that can be used for metering in

     * auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF);

     * this corresponds to the the maximum number of elements in

     * this corresponds to the maximum number of elements in

     * ACAMERA_CONTROL_AE_REGIONS, ACAMERA_CONTROL_AWB_REGIONS,

     * and ACAMERA_CONTROL_AF_REGIONS.</p>

     *

drm/drmserver/DrmManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <drm/DrmInfoRequest.h>

#include <drm/DrmSupportInfo.h>

#include <drm/DrmConvertedStatus.h>

#include <media/MediaAnalyticsItem.h>

#include <media/MediaMetricsItem.h>

#include <IDrmEngine.h>



#include "DrmManager.h"
@@ -58,7 +58,7 @@ void DrmManager::reportEngineMetrics( 
        const char func[], const String8& plugInId, const String8& mimeType) {

    IDrmEngine& engine = mPlugInManager.getPlugIn(plugInId);



    std::unique_ptr<MediaAnalyticsItem> item(MediaAnalyticsItem::create("drmmanager"));

    std::unique_ptr<mediametrics::Item> item(mediametrics::Item::create("drmmanager"));

    item->setUid(IPCThreadState::self()->getCallingUid());

    item->setCString("function_name", func);

    item->setCString("plugin_id", plugInId.getPathLeaf().getBasePath().c_str());