diff options
| -rw-r--r-- | data/etc/android.hardware.bluetooth_le.xml | 19 | ||||
| -rw-r--r-- | include/gui/GLConsumer.h | 2 | ||||
| -rw-r--r-- | libs/gui/GLConsumer.cpp | 3 |
3 files changed, 23 insertions, 1 deletions
diff --git a/data/etc/android.hardware.bluetooth_le.xml b/data/etc/android.hardware.bluetooth_le.xml new file mode 100644 index 0000000000..bf5a200a88 --- /dev/null +++ b/data/etc/android.hardware.bluetooth_le.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> +<!-- Adds the feature indicating support for the Bluetooth Low Energy API --> +<permissions> + <feature name="android.hardware.bluetooth_le" /> +</permissions> diff --git a/include/gui/GLConsumer.h b/include/gui/GLConsumer.h index 12796c5f17..1e889278c0 100644 --- a/include/gui/GLConsumer.h +++ b/include/gui/GLConsumer.h @@ -322,7 +322,7 @@ private: uint32_t mCurrentTransform; // mCurrentScalingMode is the scaling mode for the current texture. It gets - // set to each time updateTexImage is called. + // set each time updateTexImage is called. uint32_t mCurrentScalingMode; // mCurrentFence is the fence received from BufferQueue in updateTexImage. diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp index 0d7c72e606..74876122eb 100644 --- a/libs/gui/GLConsumer.cpp +++ b/libs/gui/GLConsumer.cpp @@ -82,8 +82,11 @@ GLConsumer::GLConsumer(GLuint tex, bool allowSynchronousMode, GLenum texTarget, bool useFenceSync, const sp<BufferQueue> &bufferQueue) : ConsumerBase(bufferQueue == 0 ? new BufferQueue(allowSynchronousMode) : bufferQueue), mCurrentTransform(0), + mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), mCurrentFence(Fence::NO_FENCE), mCurrentTimestamp(0), + mDefaultWidth(1), + mDefaultHeight(1), mFilteringEnabled(true), mTexName(tex), mUseFenceSync(useFenceSync), |