The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2007 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 17 | #include <stdlib.h> |
| 18 | #include <stdint.h> |
| 19 | #include <sys/types.h> |
| 20 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 21 | #include <cutils/compiler.h> |
Mathias Agopian | 076b1cc | 2009-04-10 14:24:30 -0700 | [diff] [blame] | 22 | #include <cutils/native_handle.h> |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 23 | #include <cutils/properties.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 24 | |
| 25 | #include <utils/Errors.h> |
| 26 | #include <utils/Log.h> |
| 27 | #include <utils/StopWatch.h> |
| 28 | |
Mathias Agopian | 3330b20 | 2009-10-05 17:07:12 -0700 | [diff] [blame] | 29 | #include <ui/GraphicBuffer.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 30 | #include <ui/PixelFormat.h> |
Mathias Agopian | 9cce325 | 2010-02-09 17:46:37 -0800 | [diff] [blame] | 31 | |
| 32 | #include <surfaceflinger/Surface.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 33 | |
| 34 | #include "clz.h" |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 35 | #include "DisplayHardware/DisplayHardware.h" |
| 36 | #include "DisplayHardware/HWComposer.h" |
Mathias Agopian | 1f7bec6 | 2010-06-25 18:02:21 -0700 | [diff] [blame] | 37 | #include "GLExtensions.h" |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 38 | #include "Layer.h" |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 39 | #include "SurfaceFlinger.h" |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 40 | #include "SurfaceTextureLayer.h" |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 41 | |
| 42 | #define DEBUG_RESIZE 0 |
| 43 | |
| 44 | |
| 45 | namespace android { |
| 46 | |
| 47 | // --------------------------------------------------------------------------- |
| 48 | |
Mathias Agopian | 96f0819 | 2010-06-02 23:28:45 -0700 | [diff] [blame] | 49 | Layer::Layer(SurfaceFlinger* flinger, |
| 50 | DisplayID display, const sp<Client>& client) |
| 51 | : LayerBaseClient(flinger, display, client), |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 52 | mTextureName(-1U), |
| 53 | mQueuedFrames(0), |
| 54 | mCurrentTransform(0), |
Mathias Agopian | 933389f | 2011-07-18 16:15:08 -0700 | [diff] [blame] | 55 | mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 56 | mCurrentOpacity(true), |
Mathias Agopian | 5bf3abe | 2011-03-11 17:01:07 -0800 | [diff] [blame] | 57 | mFormat(PIXEL_FORMAT_NONE), |
Mathias Agopian | 1f7bec6 | 2010-06-25 18:02:21 -0700 | [diff] [blame] | 58 | mGLExtensions(GLExtensions::getInstance()), |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 59 | mOpaqueLayer(true), |
Mathias Agopian | d606de6 | 2010-05-10 20:06:11 -0700 | [diff] [blame] | 60 | mNeedsDithering(false), |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 61 | mSecure(false), |
Mathias Agopian | 933389f | 2011-07-18 16:15:08 -0700 | [diff] [blame] | 62 | mProtectedByApp(false) |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 63 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 64 | mCurrentCrop.makeInvalid(); |
| 65 | glGenTextures(1, &mTextureName); |
Mathias Agopian | d606de6 | 2010-05-10 20:06:11 -0700 | [diff] [blame] | 66 | } |
| 67 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 68 | void Layer::onFirstRef() |
Mathias Agopian | 96f0819 | 2010-06-02 23:28:45 -0700 | [diff] [blame] | 69 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 70 | LayerBaseClient::onFirstRef(); |
Mathias Agopian | ddc31c3 | 2011-06-12 18:05:53 -0700 | [diff] [blame] | 71 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 72 | struct FrameQueuedListener : public SurfaceTexture::FrameAvailableListener { |
| 73 | FrameQueuedListener(Layer* layer) : mLayer(layer) { } |
| 74 | private: |
| 75 | wp<Layer> mLayer; |
| 76 | virtual void onFrameAvailable() { |
| 77 | sp<Layer> that(mLayer.promote()); |
| 78 | if (that != 0) { |
| 79 | that->onFrameQueued(); |
| 80 | } |
| 81 | } |
| 82 | }; |
| 83 | mSurfaceTexture = new SurfaceTextureLayer(mTextureName, this); |
| 84 | mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this)); |
| 85 | mSurfaceTexture->setSynchronousMode(true); |
| 86 | mSurfaceTexture->setBufferCountServer(2); |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 87 | } |
| 88 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 89 | Layer::~Layer() |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 90 | { |
Mathias Agopian | 47d0812 | 2011-08-11 18:18:50 -0700 | [diff] [blame] | 91 | class MessageDestroyGLState : public MessageBase { |
| 92 | GLuint texture; |
| 93 | public: |
| 94 | MessageDestroyGLState(GLuint texture) : texture(texture) { } |
| 95 | virtual bool handler() { |
| 96 | glDeleteTextures(1, &texture); |
| 97 | return true; |
| 98 | } |
| 99 | }; |
| 100 | mFlinger->postMessageAsync( new MessageDestroyGLState(mTextureName) ); |
Mathias Agopian | 96f0819 | 2010-06-02 23:28:45 -0700 | [diff] [blame] | 101 | } |
| 102 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 103 | void Layer::onFrameQueued() { |
Jamie Gennis | 3d8063b | 2011-06-26 18:27:47 -0700 | [diff] [blame] | 104 | android_atomic_inc(&mQueuedFrames); |
| 105 | mFlinger->signalEvent(); |
Mathias Agopian | 579b3f8 | 2010-06-08 19:54:15 -0700 | [diff] [blame] | 106 | } |
| 107 | |
Mathias Agopian | d606de6 | 2010-05-10 20:06:11 -0700 | [diff] [blame] | 108 | // called with SurfaceFlinger::mStateLock as soon as the layer is entered |
| 109 | // in the purgatory list |
| 110 | void Layer::onRemoved() |
| 111 | { |
Jamie Gennis | dbe6486 | 2011-07-30 14:33:49 -0700 | [diff] [blame] | 112 | mSurfaceTexture->abandon(); |
Mathias Agopian | 48d819a | 2009-09-10 19:41:18 -0700 | [diff] [blame] | 113 | } |
Mathias Agopian | cbb288b | 2009-09-07 16:32:45 -0700 | [diff] [blame] | 114 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 115 | sp<ISurface> Layer::createSurface() |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 116 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 117 | class BSurface : public BnSurface, public LayerCleaner { |
| 118 | wp<const Layer> mOwner; |
| 119 | virtual sp<ISurfaceTexture> getSurfaceTexture() const { |
| 120 | sp<ISurfaceTexture> res; |
| 121 | sp<const Layer> that( mOwner.promote() ); |
| 122 | if (that != NULL) { |
| 123 | res = that->mSurfaceTexture; |
| 124 | } |
| 125 | return res; |
| 126 | } |
| 127 | public: |
| 128 | BSurface(const sp<SurfaceFlinger>& flinger, |
| 129 | const sp<Layer>& layer) |
| 130 | : LayerCleaner(flinger, layer), mOwner(layer) { } |
| 131 | }; |
| 132 | sp<ISurface> sur(new BSurface(mFlinger, this)); |
Mathias Agopian | a1f47b9 | 2011-02-15 19:01:06 -0800 | [diff] [blame] | 133 | return sur; |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 134 | } |
| 135 | |
Jamie Gennis | 582270d | 2011-08-17 18:19:00 -0700 | [diff] [blame] | 136 | wp<IBinder> Layer::getSurfaceTextureBinder() const |
| 137 | { |
| 138 | return mSurfaceTexture->asBinder(); |
| 139 | } |
| 140 | |
Mathias Agopian | f9d9327 | 2009-06-19 17:00:27 -0700 | [diff] [blame] | 141 | status_t Layer::setBuffers( uint32_t w, uint32_t h, |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 142 | PixelFormat format, uint32_t flags) |
| 143 | { |
Mathias Agopian | 401c257 | 2009-09-23 19:16:27 -0700 | [diff] [blame] | 144 | // this surfaces pixel format |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 145 | PixelFormatInfo info; |
| 146 | status_t err = getPixelFormatInfo(format, &info); |
| 147 | if (err) return err; |
| 148 | |
Mathias Agopian | 401c257 | 2009-09-23 19:16:27 -0700 | [diff] [blame] | 149 | // the display's pixel format |
| 150 | const DisplayHardware& hw(graphicPlane(0).displayHardware()); |
Mathias Agopian | ca99fb8 | 2010-04-14 16:43:44 -0700 | [diff] [blame] | 151 | uint32_t const maxSurfaceDims = min( |
| 152 | hw.getMaxTextureSize(), hw.getMaxViewportDims()); |
| 153 | |
| 154 | // never allow a surface larger than what our underlying GL implementation |
| 155 | // can handle. |
| 156 | if ((uint32_t(w)>maxSurfaceDims) || (uint32_t(h)>maxSurfaceDims)) { |
| 157 | return BAD_VALUE; |
| 158 | } |
| 159 | |
Mathias Agopian | 401c257 | 2009-09-23 19:16:27 -0700 | [diff] [blame] | 160 | PixelFormatInfo displayInfo; |
| 161 | getPixelFormatInfo(hw.getFormat(), &displayInfo); |
Mathias Agopian | a4b740e | 2009-10-05 18:20:39 -0700 | [diff] [blame] | 162 | const uint32_t hwFlags = hw.getFlags(); |
| 163 | |
Mathias Agopian | cbb288b | 2009-09-07 16:32:45 -0700 | [diff] [blame] | 164 | mFormat = format; |
Mathias Agopian | eff062c | 2010-08-25 14:59:15 -0700 | [diff] [blame] | 165 | |
Mathias Agopian | 3330b20 | 2009-10-05 17:07:12 -0700 | [diff] [blame] | 166 | mSecure = (flags & ISurfaceComposer::eSecure) ? true : false; |
Glenn Kasten | 16f0453 | 2011-01-19 15:27:27 -0800 | [diff] [blame] | 167 | mProtectedByApp = (flags & ISurfaceComposer::eProtectedByApp) ? true : false; |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 168 | mOpaqueLayer = (flags & ISurfaceComposer::eOpaque); |
| 169 | mCurrentOpacity = getOpacityForFormat(format); |
| 170 | |
| 171 | mSurfaceTexture->setDefaultBufferSize(w, h); |
| 172 | mSurfaceTexture->setDefaultBufferFormat(format); |
Mathias Agopian | ca99fb8 | 2010-04-14 16:43:44 -0700 | [diff] [blame] | 173 | |
Mathias Agopian | 401c257 | 2009-09-23 19:16:27 -0700 | [diff] [blame] | 174 | // we use the red index |
| 175 | int displayRedSize = displayInfo.getSize(PixelFormatInfo::INDEX_RED); |
| 176 | int layerRedsize = info.getSize(PixelFormatInfo::INDEX_RED); |
| 177 | mNeedsDithering = layerRedsize > displayRedSize; |
| 178 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 179 | return NO_ERROR; |
| 180 | } |
| 181 | |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 182 | void Layer::setGeometry(hwc_layer_t* hwcl) |
| 183 | { |
Mathias Agopian | a537c0f | 2011-08-02 15:51:37 -0700 | [diff] [blame] | 184 | LayerBaseClient::setGeometry(hwcl); |
| 185 | |
| 186 | hwcl->flags &= ~HWC_SKIP_LAYER; |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 187 | |
| 188 | // we can't do alpha-fade with the hwc HAL |
| 189 | const State& s(drawingState()); |
| 190 | if (s.alpha < 0xFF) { |
| 191 | hwcl->flags = HWC_SKIP_LAYER; |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 192 | } |
| 193 | |
Mathias Agopian | 29a367b | 2011-07-12 14:51:45 -0700 | [diff] [blame] | 194 | /* |
| 195 | * Transformations are applied in this order: |
| 196 | * 1) buffer orientation/flip/mirror |
| 197 | * 2) state transformation (window manager) |
| 198 | * 3) layer orientation (screen orientation) |
Mathias Agopian | d992db3 | 2011-08-18 18:31:00 -0700 | [diff] [blame] | 199 | * mTransform is already the composition of (2) and (3) |
Mathias Agopian | 29a367b | 2011-07-12 14:51:45 -0700 | [diff] [blame] | 200 | * (NOTE: the matrices are multiplied in reverse order) |
| 201 | */ |
| 202 | |
| 203 | const Transform bufferOrientation(mCurrentTransform); |
Mathias Agopian | d992db3 | 2011-08-18 18:31:00 -0700 | [diff] [blame] | 204 | const Transform tr(mTransform * bufferOrientation); |
Mathias Agopian | 29a367b | 2011-07-12 14:51:45 -0700 | [diff] [blame] | 205 | |
| 206 | // this gives us only the "orientation" component of the transform |
| 207 | const uint32_t finalTransform = tr.getOrientation(); |
| 208 | |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 209 | // we can only handle simple transformation |
Mathias Agopian | 29a367b | 2011-07-12 14:51:45 -0700 | [diff] [blame] | 210 | if (finalTransform & Transform::ROT_INVALID) { |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 211 | hwcl->flags = HWC_SKIP_LAYER; |
Mathias Agopian | a537c0f | 2011-08-02 15:51:37 -0700 | [diff] [blame] | 212 | } else { |
| 213 | hwcl->transform = finalTransform; |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 214 | } |
Mathias Agopian | c7f3381 | 2011-08-30 15:02:41 -0700 | [diff] [blame^] | 215 | |
| 216 | if (isCropped()) { |
| 217 | hwcl->sourceCrop.left = mCurrentCrop.left; |
| 218 | hwcl->sourceCrop.top = mCurrentCrop.top; |
| 219 | hwcl->sourceCrop.right = mCurrentCrop.right; |
| 220 | hwcl->sourceCrop.bottom = mCurrentCrop.bottom; |
| 221 | } else { |
| 222 | const sp<GraphicBuffer>& buffer(mActiveBuffer); |
| 223 | hwcl->sourceCrop.left = 0; |
| 224 | hwcl->sourceCrop.top = 0; |
| 225 | if (buffer != NULL) { |
| 226 | hwcl->sourceCrop.right = buffer->width; |
| 227 | hwcl->sourceCrop.bottom = buffer->height; |
| 228 | } else { |
| 229 | hwcl->sourceCrop.right = mTransformedBounds.width(); |
| 230 | hwcl->sourceCrop.bottom = mTransformedBounds.height(); |
| 231 | } |
| 232 | } |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 233 | } |
| 234 | |
| 235 | void Layer::setPerFrameData(hwc_layer_t* hwcl) { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 236 | const sp<GraphicBuffer>& buffer(mActiveBuffer); |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 237 | if (buffer == NULL) { |
Mathias Agopian | da9584d | 2010-12-13 18:51:59 -0800 | [diff] [blame] | 238 | // this can happen if the client never drew into this layer yet, |
| 239 | // or if we ran out of memory. In that case, don't let |
| 240 | // HWC handle it. |
| 241 | hwcl->flags |= HWC_SKIP_LAYER; |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 242 | hwcl->handle = NULL; |
Mathias Agopian | a537c0f | 2011-08-02 15:51:37 -0700 | [diff] [blame] | 243 | } else { |
| 244 | hwcl->handle = buffer->handle; |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 245 | } |
Mathias Agopian | a350ff9 | 2010-08-10 17:14:02 -0700 | [diff] [blame] | 246 | } |
| 247 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 248 | void Layer::onDraw(const Region& clip) const |
| 249 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 250 | if (CC_UNLIKELY(mActiveBuffer == 0)) { |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 251 | // the texture has not been created yet, this Layer has |
Mathias Agopian | 179169e | 2010-05-06 20:21:45 -0700 | [diff] [blame] | 252 | // in fact never been drawn into. This happens frequently with |
| 253 | // SurfaceView because the WindowManager can't know when the client |
| 254 | // has drawn the first time. |
| 255 | |
| 256 | // If there is nothing under us, we paint the screen in black, otherwise |
| 257 | // we just skip this update. |
| 258 | |
| 259 | // figure out if there is something below us |
| 260 | Region under; |
Mathias Agopian | f7ae69d | 2011-08-23 12:34:29 -0700 | [diff] [blame] | 261 | const SurfaceFlinger::LayerVector& drawingLayers( |
| 262 | mFlinger->mDrawingState.layersSortedByZ); |
Mathias Agopian | 179169e | 2010-05-06 20:21:45 -0700 | [diff] [blame] | 263 | const size_t count = drawingLayers.size(); |
| 264 | for (size_t i=0 ; i<count ; ++i) { |
| 265 | const sp<LayerBase>& layer(drawingLayers[i]); |
| 266 | if (layer.get() == static_cast<LayerBase const*>(this)) |
| 267 | break; |
| 268 | under.orSelf(layer->visibleRegionScreen); |
| 269 | } |
| 270 | // if not everything below us is covered, we plug the holes! |
| 271 | Region holes(clip.subtract(under)); |
| 272 | if (!holes.isEmpty()) { |
Mathias Agopian | 0a91775 | 2010-06-14 21:20:00 -0700 | [diff] [blame] | 273 | clearWithOpenGL(holes, 0, 0, 0, 1); |
Mathias Agopian | 179169e | 2010-05-06 20:21:45 -0700 | [diff] [blame] | 274 | } |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 275 | return; |
| 276 | } |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 277 | |
Mathias Agopian | f7ae69d | 2011-08-23 12:34:29 -0700 | [diff] [blame] | 278 | const GLenum target = GL_TEXTURE_EXTERNAL_OES; |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 279 | glBindTexture(target, mTextureName); |
| 280 | if (getFiltering() || needsFiltering() || isFixedSize() || isCropped()) { |
| 281 | // TODO: we could be more subtle with isFixedSize() |
| 282 | glTexParameterx(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); |
| 283 | glTexParameterx(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); |
| 284 | } else { |
| 285 | glTexParameterx(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); |
| 286 | glTexParameterx(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); |
| 287 | } |
| 288 | glEnable(target); |
| 289 | glMatrixMode(GL_TEXTURE); |
| 290 | glLoadMatrixf(mTextureMatrix); |
| 291 | glMatrixMode(GL_MODELVIEW); |
| 292 | |
| 293 | drawWithOpenGL(clip); |
| 294 | |
| 295 | glDisable(target); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 296 | } |
| 297 | |
Eric Hassold | ac45e6b | 2011-02-10 14:41:26 -0800 | [diff] [blame] | 298 | // As documented in libhardware header, formats in the range |
| 299 | // 0x100 - 0x1FF are specific to the HAL implementation, and |
| 300 | // are known to have no alpha channel |
| 301 | // TODO: move definition for device-specific range into |
| 302 | // hardware.h, instead of using hard-coded values here. |
| 303 | #define HARDWARE_IS_DEVICE_FORMAT(f) ((f) >= 0x100 && (f) <= 0x1FF) |
| 304 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 305 | bool Layer::getOpacityForFormat(uint32_t format) |
Eric Hassold | ac45e6b | 2011-02-10 14:41:26 -0800 | [diff] [blame] | 306 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 307 | if (HARDWARE_IS_DEVICE_FORMAT(format)) { |
| 308 | return true; |
Eric Hassold | ac45e6b | 2011-02-10 14:41:26 -0800 | [diff] [blame] | 309 | } |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 310 | PixelFormatInfo info; |
| 311 | status_t err = getPixelFormatInfo(PixelFormat(format), &info); |
| 312 | // in case of error (unknown format), we assume no blending |
| 313 | return (err || info.h_alpha <= info.l_alpha); |
Eric Hassold | ac45e6b | 2011-02-10 14:41:26 -0800 | [diff] [blame] | 314 | } |
| 315 | |
Eric Hassold | ac45e6b | 2011-02-10 14:41:26 -0800 | [diff] [blame] | 316 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 317 | bool Layer::isOpaque() const |
Mathias Agopian | a7f6692 | 2010-05-26 22:08:52 -0700 | [diff] [blame] | 318 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 319 | // if we don't have a buffer yet, we're translucent regardless of the |
| 320 | // layer's opaque flag. |
Jamie Gennis | db5230f | 2011-07-28 14:54:07 -0700 | [diff] [blame] | 321 | if (mActiveBuffer == 0) { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 322 | return false; |
Jamie Gennis | db5230f | 2011-07-28 14:54:07 -0700 | [diff] [blame] | 323 | } |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 324 | |
| 325 | // if the layer has the opaque flag, then we're always opaque, |
| 326 | // otherwise we use the current buffer's format. |
| 327 | return mOpaqueLayer || mCurrentOpacity; |
Mathias Agopian | a7f6692 | 2010-05-26 22:08:52 -0700 | [diff] [blame] | 328 | } |
| 329 | |
Jamie Gennis | 7a4d0df | 2011-03-09 17:05:02 -0800 | [diff] [blame] | 330 | bool Layer::isProtected() const |
| 331 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 332 | const sp<GraphicBuffer>& activeBuffer(mActiveBuffer); |
Jamie Gennis | 7a4d0df | 2011-03-09 17:05:02 -0800 | [diff] [blame] | 333 | return (activeBuffer != 0) && |
| 334 | (activeBuffer->getUsage() & GRALLOC_USAGE_PROTECTED); |
| 335 | } |
Mathias Agopian | b5b7f26 | 2010-05-07 15:58:44 -0700 | [diff] [blame] | 336 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 337 | uint32_t Layer::doTransaction(uint32_t flags) |
| 338 | { |
| 339 | const Layer::State& front(drawingState()); |
| 340 | const Layer::State& temp(currentState()); |
| 341 | |
Mathias Agopian | a138f89 | 2010-05-21 17:24:35 -0700 | [diff] [blame] | 342 | const bool sizeChanged = (front.requested_w != temp.requested_w) || |
| 343 | (front.requested_h != temp.requested_h); |
| 344 | |
| 345 | if (sizeChanged) { |
Mathias Agopian | cbb288b | 2009-09-07 16:32:45 -0700 | [diff] [blame] | 346 | // the size changed, we need to ask our client to request a new buffer |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 347 | LOGD_IF(DEBUG_RESIZE, |
Mathias Agopian | 3fbce7c | 2011-07-25 19:56:08 -0700 | [diff] [blame] | 348 | "doTransaction: " |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 349 | "resize (layer=%p), requested (%dx%d), drawing (%d,%d), " |
Mathias Agopian | 3fbce7c | 2011-07-25 19:56:08 -0700 | [diff] [blame] | 350 | "scalingMode=%d", |
Mathias Agopian | a138f89 | 2010-05-21 17:24:35 -0700 | [diff] [blame] | 351 | this, |
| 352 | int(temp.requested_w), int(temp.requested_h), |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 353 | int(front.requested_w), int(front.requested_h), |
Mathias Agopian | 3fbce7c | 2011-07-25 19:56:08 -0700 | [diff] [blame] | 354 | mCurrentScalingMode); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 355 | |
Mathias Agopian | a138f89 | 2010-05-21 17:24:35 -0700 | [diff] [blame] | 356 | if (!isFixedSize()) { |
| 357 | // we're being resized and there is a freeze display request, |
| 358 | // acquire a freeze lock, so that the screen stays put |
| 359 | // until we've redrawn at the new size; this is to avoid |
| 360 | // glitches upon orientation changes. |
| 361 | if (mFlinger->hasFreezeRequest()) { |
| 362 | // if the surface is hidden, don't try to acquire the |
| 363 | // freeze lock, since hidden surfaces may never redraw |
| 364 | if (!(front.flags & ISurfaceComposer::eLayerHidden)) { |
| 365 | mFreezeLock = mFlinger->getFreezeLock(); |
| 366 | } |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 367 | } |
Mathias Agopian | a138f89 | 2010-05-21 17:24:35 -0700 | [diff] [blame] | 368 | |
| 369 | // this will make sure LayerBase::doTransaction doesn't update |
| 370 | // the drawing state's size |
| 371 | Layer::State& editDraw(mDrawingState); |
| 372 | editDraw.requested_w = temp.requested_w; |
| 373 | editDraw.requested_h = temp.requested_h; |
| 374 | |
| 375 | // record the new size, form this point on, when the client request |
| 376 | // a buffer, it'll get the new size. |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 377 | mSurfaceTexture->setDefaultBufferSize(temp.requested_w, temp.requested_h); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 378 | } |
| 379 | } |
Mathias Agopian | cbb288b | 2009-09-07 16:32:45 -0700 | [diff] [blame] | 380 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 381 | if (temp.sequence != front.sequence) { |
| 382 | if (temp.flags & ISurfaceComposer::eLayerHidden || temp.alpha == 0) { |
| 383 | // this surface is now hidden, so it shouldn't hold a freeze lock |
| 384 | // (it may never redraw, which is fine if it is hidden) |
| 385 | mFreezeLock.clear(); |
| 386 | } |
| 387 | } |
| 388 | |
| 389 | return LayerBase::doTransaction(flags); |
| 390 | } |
| 391 | |
Mathias Agopian | a138f89 | 2010-05-21 17:24:35 -0700 | [diff] [blame] | 392 | bool Layer::isFixedSize() const { |
Mathias Agopian | 933389f | 2011-07-18 16:15:08 -0700 | [diff] [blame] | 393 | return mCurrentScalingMode != NATIVE_WINDOW_SCALING_MODE_FREEZE; |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 394 | } |
| 395 | |
| 396 | bool Layer::isCropped() const { |
| 397 | return !mCurrentCrop.isEmpty(); |
| 398 | } |
| 399 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 400 | // ---------------------------------------------------------------------------- |
| 401 | // pageflip handling... |
| 402 | // ---------------------------------------------------------------------------- |
| 403 | |
| 404 | void Layer::lockPageFlip(bool& recomputeVisibleRegions) |
| 405 | { |
Jamie Gennis | 3d8063b | 2011-06-26 18:27:47 -0700 | [diff] [blame] | 406 | if (mQueuedFrames > 0) { |
Jamie Gennis | db5230f | 2011-07-28 14:54:07 -0700 | [diff] [blame] | 407 | const bool oldOpacity = isOpaque(); |
| 408 | |
Jamie Gennis | 3d8063b | 2011-06-26 18:27:47 -0700 | [diff] [blame] | 409 | // signal another event if we have more frames pending |
| 410 | if (android_atomic_dec(&mQueuedFrames) > 1) { |
| 411 | mFlinger->signalEvent(); |
| 412 | } |
| 413 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 414 | if (mSurfaceTexture->updateTexImage() < NO_ERROR) { |
| 415 | // something happened! |
| 416 | recomputeVisibleRegions = true; |
| 417 | return; |
| 418 | } |
Mathias Agopian | 96f0819 | 2010-06-02 23:28:45 -0700 | [diff] [blame] | 419 | |
Mathias Agopian | c7f3381 | 2011-08-30 15:02:41 -0700 | [diff] [blame^] | 420 | sp<GraphicBuffer> newFrontBuffer(mSurfaceTexture->getCurrentBuffer()); |
Mathias Agopian | d343e3d | 2010-03-15 18:15:20 -0700 | [diff] [blame] | 421 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 422 | const Rect crop(mSurfaceTexture->getCurrentCrop()); |
| 423 | const uint32_t transform(mSurfaceTexture->getCurrentTransform()); |
Mathias Agopian | 933389f | 2011-07-18 16:15:08 -0700 | [diff] [blame] | 424 | const uint32_t scalingMode(mSurfaceTexture->getCurrentScalingMode()); |
| 425 | if ((crop != mCurrentCrop) || |
| 426 | (transform != mCurrentTransform) || |
| 427 | (scalingMode != mCurrentScalingMode)) |
| 428 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 429 | mCurrentCrop = crop; |
| 430 | mCurrentTransform = transform; |
Mathias Agopian | 933389f | 2011-07-18 16:15:08 -0700 | [diff] [blame] | 431 | mCurrentScalingMode = scalingMode; |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 432 | mFlinger->invalidateHwcGeometry(); |
| 433 | } |
Mathias Agopian | da9584d | 2010-12-13 18:51:59 -0800 | [diff] [blame] | 434 | |
Mathias Agopian | c7f3381 | 2011-08-30 15:02:41 -0700 | [diff] [blame^] | 435 | GLfloat textureMatrix[16]; |
| 436 | mSurfaceTexture->getTransformMatrix(textureMatrix); |
| 437 | if (memcmp(textureMatrix, mTextureMatrix, sizeof(textureMatrix))) { |
| 438 | memcpy(mTextureMatrix, textureMatrix, sizeof(textureMatrix)); |
| 439 | mFlinger->invalidateHwcGeometry(); |
| 440 | } |
| 441 | |
| 442 | uint32_t bufWidth = newFrontBuffer->getWidth(); |
| 443 | uint32_t bufHeight = newFrontBuffer->getHeight(); |
| 444 | if (mActiveBuffer != NULL) { |
| 445 | if (bufWidth != uint32_t(mActiveBuffer->width) || |
| 446 | bufHeight != uint32_t(mActiveBuffer->height)) { |
| 447 | mFlinger->invalidateHwcGeometry(); |
| 448 | } |
| 449 | } |
| 450 | |
| 451 | mCurrentOpacity = getOpacityForFormat(newFrontBuffer->format); |
Jamie Gennis | db5230f | 2011-07-28 14:54:07 -0700 | [diff] [blame] | 452 | if (oldOpacity != isOpaque()) { |
Eric Hassold | ac45e6b | 2011-02-10 14:41:26 -0800 | [diff] [blame] | 453 | recomputeVisibleRegions = true; |
| 454 | } |
| 455 | |
Mathias Agopian | f7ae69d | 2011-08-23 12:34:29 -0700 | [diff] [blame] | 456 | glTexParameterx(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); |
| 457 | glTexParameterx(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); |
Mathias Agopian | 076b1cc | 2009-04-10 14:24:30 -0700 | [diff] [blame] | 458 | |
Mathias Agopian | d343e3d | 2010-03-15 18:15:20 -0700 | [diff] [blame] | 459 | // update the layer size and release freeze-lock |
| 460 | const Layer::State& front(drawingState()); |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 461 | |
| 462 | // FIXME: mPostedDirtyRegion = dirty & bounds |
| 463 | mPostedDirtyRegion.set(front.w, front.h); |
| 464 | |
Mathias Agopian | c7f3381 | 2011-08-30 15:02:41 -0700 | [diff] [blame^] | 465 | // update active buffer |
| 466 | mActiveBuffer = newFrontBuffer; |
Mathias Agopian | 97c602c | 2011-07-19 15:24:46 -0700 | [diff] [blame] | 467 | |
| 468 | if ((front.w != front.requested_w) || |
| 469 | (front.h != front.requested_h)) |
Mathias Agopian | df3e0b9 | 2009-09-30 14:07:22 -0700 | [diff] [blame] | 470 | { |
Mathias Agopian | 97c602c | 2011-07-19 15:24:46 -0700 | [diff] [blame] | 471 | // check that we received a buffer of the right size |
| 472 | // (Take the buffer's orientation into account) |
Mathias Agopian | 97c602c | 2011-07-19 15:24:46 -0700 | [diff] [blame] | 473 | if (mCurrentTransform & Transform::ROT_90) { |
| 474 | swap(bufWidth, bufHeight); |
| 475 | } |
| 476 | |
| 477 | if (isFixedSize() || |
| 478 | (bufWidth == front.requested_w && |
| 479 | bufHeight == front.requested_h)) |
Mathias Agopian | d343e3d | 2010-03-15 18:15:20 -0700 | [diff] [blame] | 480 | { |
| 481 | // Here we pretend the transaction happened by updating the |
| 482 | // current and drawing states. Drawing state is only accessed |
| 483 | // in this thread, no need to have it locked |
| 484 | Layer::State& editDraw(mDrawingState); |
| 485 | editDraw.w = editDraw.requested_w; |
| 486 | editDraw.h = editDraw.requested_h; |
Mathias Agopian | df3e0b9 | 2009-09-30 14:07:22 -0700 | [diff] [blame] | 487 | |
Mathias Agopian | d343e3d | 2010-03-15 18:15:20 -0700 | [diff] [blame] | 488 | // We also need to update the current state so that we don't |
| 489 | // end-up doing too much work during the next transaction. |
| 490 | // NOTE: We actually don't need hold the transaction lock here |
| 491 | // because State::w and State::h are only accessed from |
| 492 | // this thread |
| 493 | Layer::State& editTemp(currentState()); |
| 494 | editTemp.w = editDraw.w; |
| 495 | editTemp.h = editDraw.h; |
Mathias Agopian | df3e0b9 | 2009-09-30 14:07:22 -0700 | [diff] [blame] | 496 | |
Mathias Agopian | d343e3d | 2010-03-15 18:15:20 -0700 | [diff] [blame] | 497 | // recompute visible region |
| 498 | recomputeVisibleRegions = true; |
Mathias Agopian | d343e3d | 2010-03-15 18:15:20 -0700 | [diff] [blame] | 499 | |
Mathias Agopian | 97c602c | 2011-07-19 15:24:46 -0700 | [diff] [blame] | 500 | // we now have the correct size, unfreeze the screen |
| 501 | mFreezeLock.clear(); |
| 502 | } |
Mathias Agopian | 3fbce7c | 2011-07-25 19:56:08 -0700 | [diff] [blame] | 503 | |
| 504 | LOGD_IF(DEBUG_RESIZE, |
| 505 | "lockPageFlip : " |
| 506 | " (layer=%p), buffer (%ux%u, tr=%02x), " |
| 507 | "requested (%dx%d)", |
| 508 | this, |
| 509 | bufWidth, bufHeight, mCurrentTransform, |
| 510 | front.requested_w, front.requested_h); |
Mathias Agopian | df3e0b9 | 2009-09-30 14:07:22 -0700 | [diff] [blame] | 511 | } |
Mathias Agopian | caa600c | 2009-09-16 18:27:24 -0700 | [diff] [blame] | 512 | } |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 513 | } |
| 514 | |
| 515 | void Layer::unlockPageFlip( |
| 516 | const Transform& planeTransform, Region& outDirtyRegion) |
| 517 | { |
| 518 | Region dirtyRegion(mPostedDirtyRegion); |
| 519 | if (!dirtyRegion.isEmpty()) { |
| 520 | mPostedDirtyRegion.clear(); |
| 521 | // The dirty region is given in the layer's coordinate space |
| 522 | // transform the dirty region by the surface's transformation |
| 523 | // and the global transformation. |
| 524 | const Layer::State& s(drawingState()); |
| 525 | const Transform tr(planeTransform * s.transform); |
| 526 | dirtyRegion = tr.transform(dirtyRegion); |
| 527 | |
| 528 | // At this point, the dirty region is in screen space. |
| 529 | // Make sure it's constrained by the visible region (which |
| 530 | // is in screen space as well). |
| 531 | dirtyRegion.andSelf(visibleRegionScreen); |
| 532 | outDirtyRegion.orSelf(dirtyRegion); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 533 | } |
Mathias Agopian | c61de17 | 2009-11-30 11:15:41 -0800 | [diff] [blame] | 534 | if (visibleRegionScreen.isEmpty()) { |
| 535 | // an invisible layer should not hold a freeze-lock |
Mathias Agopian | 1b5e102 | 2010-04-20 17:55:49 -0700 | [diff] [blame] | 536 | // (because it may never be updated and therefore never release it) |
Mathias Agopian | c61de17 | 2009-11-30 11:15:41 -0800 | [diff] [blame] | 537 | mFreezeLock.clear(); |
| 538 | } |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 539 | } |
| 540 | |
Mathias Agopian | 1b5e102 | 2010-04-20 17:55:49 -0700 | [diff] [blame] | 541 | void Layer::dump(String8& result, char* buffer, size_t SIZE) const |
| 542 | { |
| 543 | LayerBaseClient::dump(result, buffer, SIZE); |
| 544 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 545 | sp<const GraphicBuffer> buf0(mActiveBuffer); |
| 546 | uint32_t w0=0, h0=0, s0=0, f0=0; |
Mathias Agopian | 1b5e102 | 2010-04-20 17:55:49 -0700 | [diff] [blame] | 547 | if (buf0 != 0) { |
| 548 | w0 = buf0->getWidth(); |
| 549 | h0 = buf0->getHeight(); |
| 550 | s0 = buf0->getStride(); |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 551 | f0 = buf0->format; |
Mathias Agopian | 1b5e102 | 2010-04-20 17:55:49 -0700 | [diff] [blame] | 552 | } |
| 553 | snprintf(buffer, SIZE, |
| 554 | " " |
Mathias Agopian | ad795ba | 2011-08-08 16:02:13 -0700 | [diff] [blame] | 555 | "format=%2d, activeBuffer=[%4ux%4u:%4u,%3X]," |
Mathias Agopian | a458364 | 2011-08-23 18:03:18 -0700 | [diff] [blame] | 556 | " freezeLock=%p, transform-hint=0x%02x, queued-frames=%d\n", |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 557 | mFormat, w0, h0, s0,f0, |
Mathias Agopian | a458364 | 2011-08-23 18:03:18 -0700 | [diff] [blame] | 558 | getFreezeLock().get(), getTransformHint(), mQueuedFrames); |
Mathias Agopian | 1b5e102 | 2010-04-20 17:55:49 -0700 | [diff] [blame] | 559 | |
| 560 | result.append(buffer); |
Mathias Agopian | 1b5e102 | 2010-04-20 17:55:49 -0700 | [diff] [blame] | 561 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 562 | if (mSurfaceTexture != 0) { |
| 563 | mSurfaceTexture->dump(result, " ", buffer, SIZE); |
Mathias Agopian | 579b3f8 | 2010-06-08 19:54:15 -0700 | [diff] [blame] | 564 | } |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 565 | } |
| 566 | |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 567 | uint32_t Layer::getEffectiveUsage(uint32_t usage) const |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 568 | { |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 569 | // TODO: should we do something special if mSecure is set? |
| 570 | if (mProtectedByApp) { |
| 571 | // need a hardware-protected path to external video sink |
| 572 | usage |= GraphicBuffer::USAGE_PROTECTED; |
Jamie Gennis | 54cc83e | 2010-11-02 11:51:32 -0700 | [diff] [blame] | 573 | } |
Jamie Gennis | 3599bf2 | 2011-08-10 11:48:07 -0700 | [diff] [blame] | 574 | usage |= GraphicBuffer::USAGE_HW_COMPOSER; |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 575 | return usage; |
Mathias Agopian | b5b7f26 | 2010-05-07 15:58:44 -0700 | [diff] [blame] | 576 | } |
| 577 | |
Mathias Agopian | a458364 | 2011-08-23 18:03:18 -0700 | [diff] [blame] | 578 | uint32_t Layer::getTransformHint() const { |
| 579 | uint32_t orientation = 0; |
| 580 | if (!mFlinger->mDebugDisableTransformHint) { |
| 581 | orientation = getOrientation(); |
| 582 | if (orientation & Transform::ROT_INVALID) { |
| 583 | orientation = 0; |
| 584 | } |
| 585 | } |
| 586 | return orientation; |
| 587 | } |
| 588 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 589 | // --------------------------------------------------------------------------- |
| 590 | |
| 591 | |
| 592 | }; // namespace android |