LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE

Browse Source 
This reverts commit 52f92faa60.
This commit is contained in:
Igor Murashkin
2013-01-30 16:31:51 -08:00
parent fb198383cc
commit 28ecf8da88
2 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/emulator/system/camera/EmulatedFakeCamera2.cpp
View File

@@ -28,7 +28,6 @@
#include <ui/Rect.h>
#include <ui/GraphicBufferMapper.h>
#include "gralloc_cb.h"
#include "FutureMetadata.h"
namespace android {

32
tools/emulator/system/camera/FutureMetadata.h
View File

@@ -1,32 +0,0 @@
/*
* Copyright (C) 2012 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.
*/
/*
* Rename select master metadata 2.0 symbols to metadata symbols in jb-mr1-dev
* - this avoids having to bring in cross-repo changes
*/
#ifndef HW_EMULATOR_CAMERA_FUTURE_METADATA_H
#define HW_EMULATOR_CAMERA_FUTURE_METADATA_H
#define ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE ANDROID_SENSOR_EXPOSURE_TIME_RANGE
#define ANDROID_CONTROL_MODE_OFF ANDROID_CONTROL_OFF
#define ANDROID_CONTROL_EFFECT_MODE_OFF ANDROID_CONTROL_EFFECT_OFF
#define ANDROID_CONTROL_AF_MODE_OFF ANDROID_CONTROL_AF_OFF
#define ANDROID_CONTROL_AE_MODE_OFF ANDROID_CONTROL_AE_OFF
#define ANDROID_CONTROL_AWB_MODE_OFF ANDROID_CONTROL_AWB_OFF
#endif