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 | |
| 17 | #define LOG_TAG "SurfaceComposerClient" |
| 18 | |
| 19 | #include <stdint.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 20 | #include <sys/types.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 21 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 22 | #include <utils/Errors.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 23 | #include <utils/Log.h> |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 24 | #include <utils/Singleton.h> |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 25 | #include <utils/SortedVector.h> |
| 26 | #include <utils/String8.h> |
| 27 | #include <utils/threads.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 28 | |
Mathias Agopian | 9cce325 | 2010-02-09 17:46:37 -0800 | [diff] [blame] | 29 | #include <binder/IMemory.h> |
Mathias Agopian | a67932f | 2011-04-20 14:20:59 -0700 | [diff] [blame] | 30 | #include <binder/IServiceManager.h> |
Mathias Agopian | 9cce325 | 2010-02-09 17:46:37 -0800 | [diff] [blame] | 31 | |
Mathias Agopian | 076b1cc | 2009-04-10 14:24:30 -0700 | [diff] [blame] | 32 | #include <ui/DisplayInfo.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 33 | |
Mathias Agopian | 90ac799 | 2012-02-25 18:48:35 -0800 | [diff] [blame] | 34 | #include <gui/ISurface.h> |
| 35 | #include <gui/ISurfaceComposer.h> |
| 36 | #include <gui/ISurfaceComposerClient.h> |
| 37 | #include <gui/SurfaceComposerClient.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 38 | |
Mathias Agopian | 41f673c | 2011-11-17 17:48:35 -0800 | [diff] [blame] | 39 | #include <private/gui/ComposerService.h> |
Mathias Agopian | 90ac799 | 2012-02-25 18:48:35 -0800 | [diff] [blame] | 40 | #include <private/gui/LayerState.h> |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 41 | |
| 42 | namespace android { |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 43 | // --------------------------------------------------------------------------- |
| 44 | |
Mathias Agopian | 7e27f05 | 2010-05-28 14:22:23 -0700 | [diff] [blame] | 45 | ANDROID_SINGLETON_STATIC_INSTANCE(ComposerService); |
| 46 | |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 47 | ComposerService::ComposerService() |
| 48 | : Singleton<ComposerService>() { |
Andy McFadden | 6652b3e | 2012-09-06 18:45:56 -0700 | [diff] [blame] | 49 | Mutex::Autolock _l(mLock); |
| 50 | connectLocked(); |
| 51 | } |
| 52 | |
| 53 | void ComposerService::connectLocked() { |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 54 | const String16 name("SurfaceFlinger"); |
| 55 | while (getService(name, &mComposerService) != NO_ERROR) { |
| 56 | usleep(250000); |
| 57 | } |
Andy McFadden | 6652b3e | 2012-09-06 18:45:56 -0700 | [diff] [blame] | 58 | assert(mComposerService != NULL); |
| 59 | |
| 60 | // Create the death listener. |
| 61 | class DeathObserver : public IBinder::DeathRecipient { |
| 62 | ComposerService& mComposerService; |
| 63 | virtual void binderDied(const wp<IBinder>& who) { |
| 64 | ALOGW("ComposerService remote (surfaceflinger) died [%p]", |
| 65 | who.unsafe_get()); |
| 66 | mComposerService.composerServiceDied(); |
| 67 | } |
| 68 | public: |
| 69 | DeathObserver(ComposerService& mgr) : mComposerService(mgr) { } |
| 70 | }; |
| 71 | |
| 72 | mDeathObserver = new DeathObserver(*const_cast<ComposerService*>(this)); |
| 73 | mComposerService->asBinder()->linkToDeath(mDeathObserver); |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 74 | } |
| 75 | |
Andy McFadden | 6652b3e | 2012-09-06 18:45:56 -0700 | [diff] [blame] | 76 | /*static*/ sp<ISurfaceComposer> ComposerService::getComposerService() { |
| 77 | ComposerService& instance = ComposerService::getInstance(); |
| 78 | Mutex::Autolock _l(instance.mLock); |
| 79 | if (instance.mComposerService == NULL) { |
| 80 | ComposerService::getInstance().connectLocked(); |
| 81 | assert(instance.mComposerService != NULL); |
| 82 | ALOGD("ComposerService reconnected"); |
| 83 | } |
| 84 | return instance.mComposerService; |
| 85 | } |
| 86 | |
| 87 | void ComposerService::composerServiceDied() |
| 88 | { |
| 89 | Mutex::Autolock _l(mLock); |
| 90 | mComposerService = NULL; |
| 91 | mDeathObserver = NULL; |
Mathias Agopian | b7e930d | 2010-06-01 15:12:58 -0700 | [diff] [blame] | 92 | } |
| 93 | |
Mathias Agopian | 7e27f05 | 2010-05-28 14:22:23 -0700 | [diff] [blame] | 94 | // --------------------------------------------------------------------------- |
| 95 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 96 | static inline |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 97 | int compare_type(const ComposerState& lhs, const ComposerState& rhs) { |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 98 | if (lhs.client < rhs.client) return -1; |
| 99 | if (lhs.client > rhs.client) return 1; |
| 100 | if (lhs.state.surface < rhs.state.surface) return -1; |
| 101 | if (lhs.state.surface > rhs.state.surface) return 1; |
| 102 | return 0; |
| 103 | } |
| 104 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 105 | static inline |
| 106 | int compare_type(const DisplayState& lhs, const DisplayState& rhs) { |
| 107 | return compare_type(lhs.token, rhs.token); |
| 108 | } |
| 109 | |
Mathias Agopian | 7e27f05 | 2010-05-28 14:22:23 -0700 | [diff] [blame] | 110 | class Composer : public Singleton<Composer> |
| 111 | { |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 112 | friend class Singleton<Composer>; |
| 113 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 114 | mutable Mutex mLock; |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 115 | SortedVector<ComposerState> mComposerStates; |
| 116 | SortedVector<DisplayState > mDisplayStates; |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 117 | uint32_t mForceSynchronous; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 118 | |
Jamie Gennis | b8d69a5 | 2011-10-10 15:48:06 -0700 | [diff] [blame] | 119 | Composer() : Singleton<Composer>(), |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 120 | mForceSynchronous(0) |
| 121 | { } |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 122 | |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 123 | void closeGlobalTransactionImpl(bool synchronous); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 124 | |
| 125 | layer_state_t* getLayerStateLocked( |
| 126 | const sp<SurfaceComposerClient>& client, SurfaceID id); |
| 127 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 128 | DisplayState& getDisplayStateLocked(const sp<IBinder>& token); |
| 129 | |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 130 | public: |
Andy McFadden | 8dfa92f | 2012-09-17 18:27:17 -0700 | [diff] [blame] | 131 | sp<IBinder> createDisplay(const String8& displayName); |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 132 | sp<IBinder> getBuiltInDisplay(int32_t id); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 133 | |
| 134 | status_t setPosition(const sp<SurfaceComposerClient>& client, SurfaceID id, |
Mathias Agopian | 41b6aab | 2011-08-30 18:51:54 -0700 | [diff] [blame] | 135 | float x, float y); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 136 | status_t setSize(const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 137 | uint32_t w, uint32_t h); |
| 138 | status_t setLayer(const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 139 | int32_t z); |
| 140 | status_t setFlags(const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 141 | uint32_t flags, uint32_t mask); |
| 142 | status_t setTransparentRegionHint( |
| 143 | const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 144 | const Region& transparentRegion); |
| 145 | status_t setAlpha(const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 146 | float alpha); |
| 147 | status_t setMatrix(const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 148 | float dsdx, float dtdx, float dsdy, float dtdy); |
Jamie Gennis | b8d69a5 | 2011-10-10 15:48:06 -0700 | [diff] [blame] | 149 | status_t setOrientation(int orientation); |
Jamie Gennis | f15a83f | 2012-05-10 20:43:55 -0700 | [diff] [blame] | 150 | status_t setCrop(const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 151 | const Rect& crop); |
Mathias Agopian | 8785578 | 2012-07-24 21:41:09 -0700 | [diff] [blame] | 152 | status_t setLayerStack(const sp<SurfaceComposerClient>& client, |
| 153 | SurfaceID id, uint32_t layerStack); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 154 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 155 | void setDisplaySurface(const sp<IBinder>& token, const sp<ISurfaceTexture>& surface); |
| 156 | void setDisplayLayerStack(const sp<IBinder>& token, uint32_t layerStack); |
Mathias Agopian | 00e8c7a | 2012-09-04 19:30:46 -0700 | [diff] [blame] | 157 | void setDisplayProjection(const sp<IBinder>& token, |
| 158 | uint32_t orientation, |
| 159 | const Rect& layerStackRect, |
| 160 | const Rect& displayRect); |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 161 | |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 162 | static void closeGlobalTransaction(bool synchronous) { |
| 163 | Composer::getInstance().closeGlobalTransactionImpl(synchronous); |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 164 | } |
| 165 | }; |
| 166 | |
| 167 | ANDROID_SINGLETON_STATIC_INSTANCE(Composer); |
| 168 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 169 | // --------------------------------------------------------------------------- |
| 170 | |
Andy McFadden | 8dfa92f | 2012-09-17 18:27:17 -0700 | [diff] [blame] | 171 | sp<IBinder> Composer::createDisplay(const String8& displayName) { |
| 172 | return ComposerService::getComposerService()->createDisplay(displayName); |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 173 | } |
| 174 | |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 175 | sp<IBinder> Composer::getBuiltInDisplay(int32_t id) { |
| 176 | return ComposerService::getComposerService()->getBuiltInDisplay(id); |
| 177 | } |
| 178 | |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 179 | void Composer::closeGlobalTransactionImpl(bool synchronous) { |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 180 | sp<ISurfaceComposer> sm(ComposerService::getComposerService()); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 181 | |
| 182 | Vector<ComposerState> transaction; |
Mathias Agopian | 8b33f03 | 2012-07-24 20:43:54 -0700 | [diff] [blame] | 183 | Vector<DisplayState> displayTransaction; |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 184 | uint32_t flags = 0; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 185 | |
| 186 | { // scope for the lock |
| 187 | Mutex::Autolock _l(mLock); |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 188 | transaction = mComposerStates; |
| 189 | mComposerStates.clear(); |
Jamie Gennis | b8d69a5 | 2011-10-10 15:48:06 -0700 | [diff] [blame] | 190 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 191 | displayTransaction = mDisplayStates; |
| 192 | mDisplayStates.clear(); |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 193 | |
| 194 | if (synchronous || mForceSynchronous) { |
| 195 | flags |= ISurfaceComposer::eSynchronous; |
| 196 | } |
| 197 | mForceSynchronous = false; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 198 | } |
| 199 | |
Mathias Agopian | 8b33f03 | 2012-07-24 20:43:54 -0700 | [diff] [blame] | 200 | sm->setTransactionState(transaction, displayTransaction, flags); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 201 | } |
| 202 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 203 | layer_state_t* Composer::getLayerStateLocked( |
| 204 | const sp<SurfaceComposerClient>& client, SurfaceID id) { |
| 205 | |
| 206 | ComposerState s; |
| 207 | s.client = client->mClient; |
| 208 | s.state.surface = id; |
| 209 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 210 | ssize_t index = mComposerStates.indexOf(s); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 211 | if (index < 0) { |
| 212 | // we don't have it, add an initialized layer_state to our list |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 213 | index = mComposerStates.add(s); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 214 | } |
| 215 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 216 | ComposerState* const out = mComposerStates.editArray(); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 217 | return &(out[index].state); |
| 218 | } |
| 219 | |
| 220 | status_t Composer::setPosition(const sp<SurfaceComposerClient>& client, |
Mathias Agopian | 41b6aab | 2011-08-30 18:51:54 -0700 | [diff] [blame] | 221 | SurfaceID id, float x, float y) { |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 222 | Mutex::Autolock _l(mLock); |
| 223 | layer_state_t* s = getLayerStateLocked(client, id); |
| 224 | if (!s) |
| 225 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 226 | s->what |= layer_state_t::ePositionChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 227 | s->x = x; |
| 228 | s->y = y; |
| 229 | return NO_ERROR; |
| 230 | } |
| 231 | |
| 232 | status_t Composer::setSize(const sp<SurfaceComposerClient>& client, |
| 233 | SurfaceID id, uint32_t w, uint32_t h) { |
| 234 | Mutex::Autolock _l(mLock); |
| 235 | layer_state_t* s = getLayerStateLocked(client, id); |
| 236 | if (!s) |
| 237 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 238 | s->what |= layer_state_t::eSizeChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 239 | s->w = w; |
| 240 | s->h = h; |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 241 | |
| 242 | // Resizing a surface makes the transaction synchronous. |
| 243 | mForceSynchronous = true; |
| 244 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 245 | return NO_ERROR; |
| 246 | } |
| 247 | |
| 248 | status_t Composer::setLayer(const sp<SurfaceComposerClient>& client, |
| 249 | SurfaceID id, int32_t z) { |
| 250 | Mutex::Autolock _l(mLock); |
| 251 | layer_state_t* s = getLayerStateLocked(client, id); |
| 252 | if (!s) |
| 253 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 254 | s->what |= layer_state_t::eLayerChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 255 | s->z = z; |
| 256 | return NO_ERROR; |
| 257 | } |
| 258 | |
| 259 | status_t Composer::setFlags(const sp<SurfaceComposerClient>& client, |
| 260 | SurfaceID id, uint32_t flags, |
| 261 | uint32_t mask) { |
| 262 | Mutex::Autolock _l(mLock); |
| 263 | layer_state_t* s = getLayerStateLocked(client, id); |
| 264 | if (!s) |
| 265 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 266 | s->what |= layer_state_t::eVisibilityChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 267 | s->flags &= ~mask; |
| 268 | s->flags |= (flags & mask); |
| 269 | s->mask |= mask; |
| 270 | return NO_ERROR; |
| 271 | } |
| 272 | |
| 273 | status_t Composer::setTransparentRegionHint( |
| 274 | const sp<SurfaceComposerClient>& client, SurfaceID id, |
| 275 | const Region& transparentRegion) { |
| 276 | Mutex::Autolock _l(mLock); |
| 277 | layer_state_t* s = getLayerStateLocked(client, id); |
| 278 | if (!s) |
| 279 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 280 | s->what |= layer_state_t::eTransparentRegionChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 281 | s->transparentRegion = transparentRegion; |
| 282 | return NO_ERROR; |
| 283 | } |
| 284 | |
| 285 | status_t Composer::setAlpha(const sp<SurfaceComposerClient>& client, |
| 286 | SurfaceID id, float alpha) { |
| 287 | Mutex::Autolock _l(mLock); |
| 288 | layer_state_t* s = getLayerStateLocked(client, id); |
| 289 | if (!s) |
| 290 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 291 | s->what |= layer_state_t::eAlphaChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 292 | s->alpha = alpha; |
| 293 | return NO_ERROR; |
| 294 | } |
| 295 | |
Mathias Agopian | 8785578 | 2012-07-24 21:41:09 -0700 | [diff] [blame] | 296 | status_t Composer::setLayerStack(const sp<SurfaceComposerClient>& client, |
| 297 | SurfaceID id, uint32_t layerStack) { |
| 298 | Mutex::Autolock _l(mLock); |
| 299 | layer_state_t* s = getLayerStateLocked(client, id); |
| 300 | if (!s) |
| 301 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 302 | s->what |= layer_state_t::eLayerStackChanged; |
Mathias Agopian | 8785578 | 2012-07-24 21:41:09 -0700 | [diff] [blame] | 303 | s->layerStack = layerStack; |
| 304 | return NO_ERROR; |
| 305 | } |
| 306 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 307 | status_t Composer::setMatrix(const sp<SurfaceComposerClient>& client, |
| 308 | SurfaceID id, float dsdx, float dtdx, |
| 309 | float dsdy, float dtdy) { |
| 310 | Mutex::Autolock _l(mLock); |
| 311 | layer_state_t* s = getLayerStateLocked(client, id); |
| 312 | if (!s) |
| 313 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 314 | s->what |= layer_state_t::eMatrixChanged; |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 315 | layer_state_t::matrix22_t matrix; |
| 316 | matrix.dsdx = dsdx; |
| 317 | matrix.dtdx = dtdx; |
| 318 | matrix.dsdy = dsdy; |
| 319 | matrix.dtdy = dtdy; |
| 320 | s->matrix = matrix; |
| 321 | return NO_ERROR; |
| 322 | } |
| 323 | |
Jamie Gennis | f15a83f | 2012-05-10 20:43:55 -0700 | [diff] [blame] | 324 | status_t Composer::setCrop(const sp<SurfaceComposerClient>& client, |
| 325 | SurfaceID id, const Rect& crop) { |
| 326 | Mutex::Autolock _l(mLock); |
| 327 | layer_state_t* s = getLayerStateLocked(client, id); |
| 328 | if (!s) |
| 329 | return BAD_INDEX; |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 330 | s->what |= layer_state_t::eCropChanged; |
Jamie Gennis | f15a83f | 2012-05-10 20:43:55 -0700 | [diff] [blame] | 331 | s->crop = crop; |
| 332 | return NO_ERROR; |
| 333 | } |
| 334 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 335 | // --------------------------------------------------------------------------- |
| 336 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 337 | DisplayState& Composer::getDisplayStateLocked(const sp<IBinder>& token) { |
| 338 | DisplayState s; |
| 339 | s.token = token; |
| 340 | ssize_t index = mDisplayStates.indexOf(s); |
| 341 | if (index < 0) { |
| 342 | // we don't have it, add an initialized layer_state to our list |
| 343 | s.what = 0; |
| 344 | index = mDisplayStates.add(s); |
| 345 | } |
| 346 | return mDisplayStates.editItemAt(index); |
| 347 | } |
| 348 | |
| 349 | void Composer::setDisplaySurface(const sp<IBinder>& token, |
| 350 | const sp<ISurfaceTexture>& surface) { |
| 351 | Mutex::Autolock _l(mLock); |
| 352 | DisplayState& s(getDisplayStateLocked(token)); |
| 353 | s.surface = surface; |
| 354 | s.what |= DisplayState::eSurfaceChanged; |
| 355 | } |
| 356 | |
| 357 | void Composer::setDisplayLayerStack(const sp<IBinder>& token, |
| 358 | uint32_t layerStack) { |
| 359 | Mutex::Autolock _l(mLock); |
| 360 | DisplayState& s(getDisplayStateLocked(token)); |
| 361 | s.layerStack = layerStack; |
| 362 | s.what |= DisplayState::eLayerStackChanged; |
| 363 | } |
| 364 | |
Mathias Agopian | 00e8c7a | 2012-09-04 19:30:46 -0700 | [diff] [blame] | 365 | void Composer::setDisplayProjection(const sp<IBinder>& token, |
| 366 | uint32_t orientation, |
| 367 | const Rect& layerStackRect, |
| 368 | const Rect& displayRect) { |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 369 | Mutex::Autolock _l(mLock); |
| 370 | DisplayState& s(getDisplayStateLocked(token)); |
| 371 | s.orientation = orientation; |
Mathias Agopian | 00e8c7a | 2012-09-04 19:30:46 -0700 | [diff] [blame] | 372 | s.viewport = layerStackRect; |
| 373 | s.frame = displayRect; |
| 374 | s.what |= DisplayState::eDisplayProjectionChanged; |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 375 | mForceSynchronous = true; // TODO: do we actually still need this? |
| 376 | } |
| 377 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 378 | // --------------------------------------------------------------------------- |
| 379 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 380 | SurfaceComposerClient::SurfaceComposerClient() |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 381 | : mStatus(NO_INIT), mComposer(Composer::getInstance()) |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 382 | { |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 383 | } |
| 384 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 385 | void SurfaceComposerClient::onFirstRef() { |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 386 | sp<ISurfaceComposer> sm(ComposerService::getComposerService()); |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 387 | if (sm != 0) { |
Mathias Agopian | 7e27f05 | 2010-05-28 14:22:23 -0700 | [diff] [blame] | 388 | sp<ISurfaceComposerClient> conn = sm->createConnection(); |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 389 | if (conn != 0) { |
| 390 | mClient = conn; |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 391 | mStatus = NO_ERROR; |
| 392 | } |
| 393 | } |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 394 | } |
| 395 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 396 | SurfaceComposerClient::~SurfaceComposerClient() { |
Mathias Agopian | 631f358 | 2010-05-25 17:51:34 -0700 | [diff] [blame] | 397 | dispose(); |
| 398 | } |
Mathias Agopian | dd3423c | 2009-09-23 15:44:05 -0700 | [diff] [blame] | 399 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 400 | status_t SurfaceComposerClient::initCheck() const { |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 401 | return mStatus; |
| 402 | } |
| 403 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 404 | sp<IBinder> SurfaceComposerClient::connection() const { |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 405 | return (mClient != 0) ? mClient->asBinder() : 0; |
| 406 | } |
| 407 | |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 408 | status_t SurfaceComposerClient::linkToComposerDeath( |
| 409 | const sp<IBinder::DeathRecipient>& recipient, |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 410 | void* cookie, uint32_t flags) { |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 411 | sp<ISurfaceComposer> sm(ComposerService::getComposerService()); |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 412 | return sm->asBinder()->linkToDeath(recipient, cookie, flags); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 413 | } |
| 414 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 415 | void SurfaceComposerClient::dispose() { |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 416 | // this can be called more than once. |
Mathias Agopian | 7e27f05 | 2010-05-28 14:22:23 -0700 | [diff] [blame] | 417 | sp<ISurfaceComposerClient> client; |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 418 | Mutex::Autolock _lm(mLock); |
| 419 | if (mClient != 0) { |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 420 | client = mClient; // hold ref while lock is held |
| 421 | mClient.clear(); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 422 | } |
Mathias Agopian | d4784a3 | 2010-05-27 19:41:15 -0700 | [diff] [blame] | 423 | mStatus = NO_INIT; |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 424 | } |
| 425 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 426 | sp<SurfaceControl> SurfaceComposerClient::createSurface( |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 427 | const String8& name, |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 428 | uint32_t w, |
| 429 | uint32_t h, |
| 430 | PixelFormat format, |
| 431 | uint32_t flags) |
| 432 | { |
| 433 | sp<SurfaceControl> result; |
| 434 | if (mStatus == NO_ERROR) { |
| 435 | ISurfaceComposerClient::surface_data_t data; |
| 436 | sp<ISurface> surface = mClient->createSurface(&data, name, |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 437 | w, h, format, flags); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 438 | if (surface != 0) { |
Mathias Agopian | c10d9d9 | 2011-07-20 16:46:11 -0700 | [diff] [blame] | 439 | result = new SurfaceControl(this, surface, data); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 440 | } |
| 441 | } |
| 442 | return result; |
| 443 | } |
| 444 | |
Andy McFadden | 8dfa92f | 2012-09-17 18:27:17 -0700 | [diff] [blame] | 445 | sp<IBinder> SurfaceComposerClient::createDisplay(const String8& displayName) { |
| 446 | return Composer::getInstance().createDisplay(displayName); |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 447 | } |
| 448 | |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 449 | sp<IBinder> SurfaceComposerClient::getBuiltInDisplay(int32_t id) { |
| 450 | return Composer::getInstance().getBuiltInDisplay(id); |
| 451 | } |
| 452 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 453 | status_t SurfaceComposerClient::destroySurface(SurfaceID sid) { |
| 454 | if (mStatus != NO_ERROR) |
| 455 | return mStatus; |
| 456 | status_t err = mClient->destroySurface(sid); |
| 457 | return err; |
| 458 | } |
| 459 | |
| 460 | inline Composer& SurfaceComposerClient::getComposer() { |
| 461 | return mComposer; |
| 462 | } |
| 463 | |
| 464 | // ---------------------------------------------------------------------------- |
| 465 | |
| 466 | void SurfaceComposerClient::openGlobalTransaction() { |
| 467 | // Currently a no-op |
| 468 | } |
| 469 | |
Jamie Gennis | 2837839 | 2011-10-12 17:39:00 -0700 | [diff] [blame] | 470 | void SurfaceComposerClient::closeGlobalTransaction(bool synchronous) { |
| 471 | Composer::closeGlobalTransaction(synchronous); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 472 | } |
| 473 | |
| 474 | // ---------------------------------------------------------------------------- |
| 475 | |
Jamie Gennis | f15a83f | 2012-05-10 20:43:55 -0700 | [diff] [blame] | 476 | status_t SurfaceComposerClient::setCrop(SurfaceID id, const Rect& crop) { |
| 477 | return getComposer().setCrop(this, id, crop); |
| 478 | } |
| 479 | |
Mathias Agopian | 41b6aab | 2011-08-30 18:51:54 -0700 | [diff] [blame] | 480 | status_t SurfaceComposerClient::setPosition(SurfaceID id, float x, float y) { |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 481 | return getComposer().setPosition(this, id, x, y); |
| 482 | } |
| 483 | |
| 484 | status_t SurfaceComposerClient::setSize(SurfaceID id, uint32_t w, uint32_t h) { |
| 485 | return getComposer().setSize(this, id, w, h); |
| 486 | } |
| 487 | |
| 488 | status_t SurfaceComposerClient::setLayer(SurfaceID id, int32_t z) { |
| 489 | return getComposer().setLayer(this, id, z); |
| 490 | } |
| 491 | |
| 492 | status_t SurfaceComposerClient::hide(SurfaceID id) { |
| 493 | return getComposer().setFlags(this, id, |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 494 | layer_state_t::eLayerHidden, |
| 495 | layer_state_t::eLayerHidden); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 496 | } |
| 497 | |
Jeff Brown | 380223b | 2012-08-26 22:49:35 -0700 | [diff] [blame] | 498 | status_t SurfaceComposerClient::show(SurfaceID id) { |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 499 | return getComposer().setFlags(this, id, |
| 500 | 0, |
Mathias Agopian | 3165cc2 | 2012-08-08 19:42:09 -0700 | [diff] [blame] | 501 | layer_state_t::eLayerHidden); |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 502 | } |
| 503 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 504 | status_t SurfaceComposerClient::setFlags(SurfaceID id, uint32_t flags, |
| 505 | uint32_t mask) { |
| 506 | return getComposer().setFlags(this, id, flags, mask); |
| 507 | } |
| 508 | |
| 509 | status_t SurfaceComposerClient::setTransparentRegionHint(SurfaceID id, |
| 510 | const Region& transparentRegion) { |
| 511 | return getComposer().setTransparentRegionHint(this, id, transparentRegion); |
| 512 | } |
| 513 | |
| 514 | status_t SurfaceComposerClient::setAlpha(SurfaceID id, float alpha) { |
| 515 | return getComposer().setAlpha(this, id, alpha); |
| 516 | } |
| 517 | |
Mathias Agopian | 8785578 | 2012-07-24 21:41:09 -0700 | [diff] [blame] | 518 | status_t SurfaceComposerClient::setLayerStack(SurfaceID id, uint32_t layerStack) { |
| 519 | return getComposer().setLayerStack(this, id, layerStack); |
| 520 | } |
| 521 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 522 | status_t SurfaceComposerClient::setMatrix(SurfaceID id, float dsdx, float dtdx, |
| 523 | float dsdy, float dtdy) { |
| 524 | return getComposer().setMatrix(this, id, dsdx, dtdx, dsdy, dtdy); |
| 525 | } |
| 526 | |
| 527 | // ---------------------------------------------------------------------------- |
| 528 | |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 529 | void SurfaceComposerClient::setDisplaySurface(const sp<IBinder>& token, |
| 530 | const sp<ISurfaceTexture>& surface) { |
| 531 | Composer::getInstance().setDisplaySurface(token, surface); |
| 532 | } |
| 533 | |
| 534 | void SurfaceComposerClient::setDisplayLayerStack(const sp<IBinder>& token, |
| 535 | uint32_t layerStack) { |
| 536 | Composer::getInstance().setDisplayLayerStack(token, layerStack); |
| 537 | } |
| 538 | |
Mathias Agopian | 00e8c7a | 2012-09-04 19:30:46 -0700 | [diff] [blame] | 539 | void SurfaceComposerClient::setDisplayProjection(const sp<IBinder>& token, |
| 540 | uint32_t orientation, |
| 541 | const Rect& layerStackRect, |
| 542 | const Rect& displayRect) { |
| 543 | Composer::getInstance().setDisplayProjection(token, orientation, |
| 544 | layerStackRect, displayRect); |
Mathias Agopian | e57f292 | 2012-08-09 16:29:12 -0700 | [diff] [blame] | 545 | } |
| 546 | |
| 547 | // ---------------------------------------------------------------------------- |
| 548 | |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 549 | status_t SurfaceComposerClient::getDisplayInfo( |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 550 | const sp<IBinder>& display, DisplayInfo* info) |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 551 | { |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 552 | return ComposerService::getComposerService()->getDisplayInfo(display, info); |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 553 | } |
| 554 | |
Jeff Brown | 2a09bb3 | 2012-10-08 19:13:57 -0700 | [diff] [blame^] | 555 | void SurfaceComposerClient::blankDisplay(const sp<IBinder>& token) { |
| 556 | ComposerService::getComposerService()->blank(token); |
| 557 | } |
| 558 | |
| 559 | void SurfaceComposerClient::unblankDisplay(const sp<IBinder>& token) { |
| 560 | ComposerService::getComposerService()->unblank(token); |
| 561 | } |
| 562 | |
Mathias Agopian | 698c087 | 2011-06-28 19:09:31 -0700 | [diff] [blame] | 563 | // ---------------------------------------------------------------------------- |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 564 | |
Mathias Agopian | 74c40c0 | 2010-09-29 13:02:36 -0700 | [diff] [blame] | 565 | ScreenshotClient::ScreenshotClient() |
| 566 | : mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE) { |
| 567 | } |
| 568 | |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 569 | status_t ScreenshotClient::update(const sp<IBinder>& display) { |
Mathias Agopian | 74c40c0 | 2010-09-29 13:02:36 -0700 | [diff] [blame] | 570 | sp<ISurfaceComposer> s(ComposerService::getComposerService()); |
| 571 | if (s == NULL) return NO_INIT; |
| 572 | mHeap = 0; |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 573 | return s->captureScreen(display, &mHeap, |
Mathias Agopian | bf2c6a6 | 2010-12-10 16:22:31 -0800 | [diff] [blame] | 574 | &mWidth, &mHeight, &mFormat, 0, 0, |
| 575 | 0, -1UL); |
Mathias Agopian | 74c40c0 | 2010-09-29 13:02:36 -0700 | [diff] [blame] | 576 | } |
| 577 | |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 578 | status_t ScreenshotClient::update(const sp<IBinder>& display, |
| 579 | uint32_t reqWidth, uint32_t reqHeight) { |
Mathias Agopian | 74c40c0 | 2010-09-29 13:02:36 -0700 | [diff] [blame] | 580 | sp<ISurfaceComposer> s(ComposerService::getComposerService()); |
| 581 | if (s == NULL) return NO_INIT; |
| 582 | mHeap = 0; |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 583 | return s->captureScreen(display, &mHeap, |
Mathias Agopian | bf2c6a6 | 2010-12-10 16:22:31 -0800 | [diff] [blame] | 584 | &mWidth, &mHeight, &mFormat, reqWidth, reqHeight, |
| 585 | 0, -1UL); |
| 586 | } |
| 587 | |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 588 | status_t ScreenshotClient::update(const sp<IBinder>& display, |
| 589 | uint32_t reqWidth, uint32_t reqHeight, |
Mathias Agopian | bf2c6a6 | 2010-12-10 16:22:31 -0800 | [diff] [blame] | 590 | uint32_t minLayerZ, uint32_t maxLayerZ) { |
| 591 | sp<ISurfaceComposer> s(ComposerService::getComposerService()); |
| 592 | if (s == NULL) return NO_INIT; |
| 593 | mHeap = 0; |
Jeff Brown | 9d4e3d2 | 2012-08-24 20:00:51 -0700 | [diff] [blame] | 594 | return s->captureScreen(display, &mHeap, |
Mathias Agopian | bf2c6a6 | 2010-12-10 16:22:31 -0800 | [diff] [blame] | 595 | &mWidth, &mHeight, &mFormat, reqWidth, reqHeight, |
| 596 | minLayerZ, maxLayerZ); |
Mathias Agopian | 74c40c0 | 2010-09-29 13:02:36 -0700 | [diff] [blame] | 597 | } |
| 598 | |
| 599 | void ScreenshotClient::release() { |
| 600 | mHeap = 0; |
| 601 | } |
| 602 | |
| 603 | void const* ScreenshotClient::getPixels() const { |
| 604 | return mHeap->getBase(); |
| 605 | } |
| 606 | |
| 607 | uint32_t ScreenshotClient::getWidth() const { |
| 608 | return mWidth; |
| 609 | } |
| 610 | |
| 611 | uint32_t ScreenshotClient::getHeight() const { |
| 612 | return mHeight; |
| 613 | } |
| 614 | |
| 615 | PixelFormat ScreenshotClient::getFormat() const { |
| 616 | return mFormat; |
| 617 | } |
| 618 | |
| 619 | uint32_t ScreenshotClient::getStride() const { |
| 620 | return mWidth; |
| 621 | } |
| 622 | |
| 623 | size_t ScreenshotClient::getSize() const { |
| 624 | return mHeap->getSize(); |
| 625 | } |
| 626 | |
| 627 | // ---------------------------------------------------------------------------- |
The Android Open Source Project | edbf3b6 | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 628 | }; // namespace android |