blob: 3f6ccc9acdf8810cf254e395b2bc8269597cf229 [file] [log] [blame]
Jeff Brown5541de92011-04-11 11:54:25 -07001/*
2 * Copyright (C) 2011 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 "Sprites"
18
19//#define LOG_NDEBUG 0
20
21#include "SpriteController.h"
22
23#include <cutils/log.h>
24#include <utils/String8.h>
Mathias Agopian52800612013-02-14 17:11:20 -080025#include <gui/Surface.h>
Jeff Brown5541de92011-04-11 11:54:25 -070026
27#include <SkBitmap.h>
28#include <SkCanvas.h>
29#include <SkColor.h>
30#include <SkPaint.h>
31#include <SkXfermode.h>
Mathias Agopian52800612013-02-14 17:11:20 -080032#include <android/native_window.h>
Jeff Brown5541de92011-04-11 11:54:25 -070033
34namespace android {
35
36// --- SpriteController ---
37
38SpriteController::SpriteController(const sp<Looper>& looper, int32_t overlayLayer) :
39 mLooper(looper), mOverlayLayer(overlayLayer) {
40 mHandler = new WeakMessageHandler(this);
Jeff Brown2352b972011-04-12 22:39:53 -070041
42 mLocked.transactionNestingCount = 0;
43 mLocked.deferredSpriteUpdate = false;
Jeff Brown5541de92011-04-11 11:54:25 -070044}
45
46SpriteController::~SpriteController() {
47 mLooper->removeMessages(mHandler);
48
49 if (mSurfaceComposerClient != NULL) {
50 mSurfaceComposerClient->dispose();
51 mSurfaceComposerClient.clear();
52 }
53}
54
55sp<Sprite> SpriteController::createSprite() {
56 return new SpriteImpl(this);
57}
58
Jeff Brown2352b972011-04-12 22:39:53 -070059void SpriteController::openTransaction() {
60 AutoMutex _l(mLock);
61
62 mLocked.transactionNestingCount += 1;
63}
64
65void SpriteController::closeTransaction() {
66 AutoMutex _l(mLock);
67
68 LOG_ALWAYS_FATAL_IF(mLocked.transactionNestingCount == 0,
69 "Sprite closeTransaction() called but there is no open sprite transaction");
70
71 mLocked.transactionNestingCount -= 1;
72 if (mLocked.transactionNestingCount == 0 && mLocked.deferredSpriteUpdate) {
73 mLocked.deferredSpriteUpdate = false;
Jeff Brown5541de92011-04-11 11:54:25 -070074 mLooper->sendMessage(mHandler, Message(MSG_UPDATE_SPRITES));
75 }
76}
77
Jeff Brown2352b972011-04-12 22:39:53 -070078void SpriteController::invalidateSpriteLocked(const sp<SpriteImpl>& sprite) {
79 bool wasEmpty = mLocked.invalidatedSprites.isEmpty();
80 mLocked.invalidatedSprites.push(sprite);
81 if (wasEmpty) {
82 if (mLocked.transactionNestingCount != 0) {
83 mLocked.deferredSpriteUpdate = true;
84 } else {
85 mLooper->sendMessage(mHandler, Message(MSG_UPDATE_SPRITES));
86 }
87 }
88}
89
Jeff Brown5541de92011-04-11 11:54:25 -070090void SpriteController::disposeSurfaceLocked(const sp<SurfaceControl>& surfaceControl) {
Jeff Brown2352b972011-04-12 22:39:53 -070091 bool wasEmpty = mLocked.disposedSurfaces.isEmpty();
92 mLocked.disposedSurfaces.push(surfaceControl);
Jeff Brown5541de92011-04-11 11:54:25 -070093 if (wasEmpty) {
94 mLooper->sendMessage(mHandler, Message(MSG_DISPOSE_SURFACES));
95 }
96}
97
98void SpriteController::handleMessage(const Message& message) {
99 switch (message.what) {
100 case MSG_UPDATE_SPRITES:
101 doUpdateSprites();
102 break;
103 case MSG_DISPOSE_SURFACES:
104 doDisposeSurfaces();
105 break;
106 }
107}
108
109void SpriteController::doUpdateSprites() {
110 // Collect information about sprite updates.
111 // Each sprite update record includes a reference to its associated sprite so we can
112 // be certain the sprites will not be deleted while this function runs. Sprites
113 // may invalidate themselves again during this time but we will handle those changes
114 // in the next iteration.
115 Vector<SpriteUpdate> updates;
116 size_t numSprites;
117 { // acquire lock
118 AutoMutex _l(mLock);
119
Jeff Brown2352b972011-04-12 22:39:53 -0700120 numSprites = mLocked.invalidatedSprites.size();
Jeff Brown5541de92011-04-11 11:54:25 -0700121 for (size_t i = 0; i < numSprites; i++) {
Jeff Brown2352b972011-04-12 22:39:53 -0700122 const sp<SpriteImpl>& sprite = mLocked.invalidatedSprites.itemAt(i);
Jeff Brown5541de92011-04-11 11:54:25 -0700123
124 updates.push(SpriteUpdate(sprite, sprite->getStateLocked()));
125 sprite->resetDirtyLocked();
126 }
Jeff Brown2352b972011-04-12 22:39:53 -0700127 mLocked.invalidatedSprites.clear();
Jeff Brown5541de92011-04-11 11:54:25 -0700128 } // release lock
129
130 // Create missing surfaces.
131 bool surfaceChanged = false;
132 for (size_t i = 0; i < numSprites; i++) {
133 SpriteUpdate& update = updates.editItemAt(i);
134
135 if (update.state.surfaceControl == NULL && update.state.wantSurfaceVisible()) {
Jeff Brown2352b972011-04-12 22:39:53 -0700136 update.state.surfaceWidth = update.state.icon.bitmap.width();
137 update.state.surfaceHeight = update.state.icon.bitmap.height();
Jeff Brown5541de92011-04-11 11:54:25 -0700138 update.state.surfaceDrawn = false;
139 update.state.surfaceVisible = false;
140 update.state.surfaceControl = obtainSurface(
141 update.state.surfaceWidth, update.state.surfaceHeight);
142 if (update.state.surfaceControl != NULL) {
143 update.surfaceChanged = surfaceChanged = true;
144 }
145 }
146 }
147
148 // Resize sprites if needed, inside a global transaction.
149 bool haveGlobalTransaction = false;
150 for (size_t i = 0; i < numSprites; i++) {
151 SpriteUpdate& update = updates.editItemAt(i);
152
153 if (update.state.surfaceControl != NULL && update.state.wantSurfaceVisible()) {
Jeff Brown2352b972011-04-12 22:39:53 -0700154 int32_t desiredWidth = update.state.icon.bitmap.width();
155 int32_t desiredHeight = update.state.icon.bitmap.height();
Jeff Brown5541de92011-04-11 11:54:25 -0700156 if (update.state.surfaceWidth < desiredWidth
157 || update.state.surfaceHeight < desiredHeight) {
158 if (!haveGlobalTransaction) {
159 SurfaceComposerClient::openGlobalTransaction();
160 haveGlobalTransaction = true;
161 }
162
163 status_t status = update.state.surfaceControl->setSize(desiredWidth, desiredHeight);
164 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000165 ALOGE("Error %d resizing sprite surface from %dx%d to %dx%d",
Jeff Brown5541de92011-04-11 11:54:25 -0700166 status, update.state.surfaceWidth, update.state.surfaceHeight,
167 desiredWidth, desiredHeight);
168 } else {
169 update.state.surfaceWidth = desiredWidth;
170 update.state.surfaceHeight = desiredHeight;
171 update.state.surfaceDrawn = false;
172 update.surfaceChanged = surfaceChanged = true;
173
174 if (update.state.surfaceVisible) {
175 status = update.state.surfaceControl->hide();
176 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000177 ALOGE("Error %d hiding sprite surface after resize.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700178 } else {
179 update.state.surfaceVisible = false;
180 }
181 }
182 }
183 }
184 }
185 }
186 if (haveGlobalTransaction) {
187 SurfaceComposerClient::closeGlobalTransaction();
188 }
189
190 // Redraw sprites if needed.
191 for (size_t i = 0; i < numSprites; i++) {
192 SpriteUpdate& update = updates.editItemAt(i);
193
194 if ((update.state.dirty & DIRTY_BITMAP) && update.state.surfaceDrawn) {
195 update.state.surfaceDrawn = false;
196 update.surfaceChanged = surfaceChanged = true;
197 }
198
199 if (update.state.surfaceControl != NULL && !update.state.surfaceDrawn
200 && update.state.wantSurfaceVisible()) {
201 sp<Surface> surface = update.state.surfaceControl->getSurface();
Mathias Agopian52800612013-02-14 17:11:20 -0800202 ANativeWindow_Buffer outBuffer;
203 status_t status = surface->lock(&outBuffer, NULL);
Jeff Brown5541de92011-04-11 11:54:25 -0700204 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000205 ALOGE("Error %d locking sprite surface before drawing.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700206 } else {
207 SkBitmap surfaceBitmap;
Mathias Agopian52800612013-02-14 17:11:20 -0800208 ssize_t bpr = outBuffer.stride * bytesPerPixel(outBuffer.format);
Jeff Brown5541de92011-04-11 11:54:25 -0700209 surfaceBitmap.setConfig(SkBitmap::kARGB_8888_Config,
Mathias Agopian52800612013-02-14 17:11:20 -0800210 outBuffer.width, outBuffer.height, bpr);
211 surfaceBitmap.setPixels(outBuffer.bits);
Jeff Brown5541de92011-04-11 11:54:25 -0700212
Derek Sollenbergerfc615a02012-12-20 14:39:57 -0500213 SkCanvas surfaceCanvas(surfaceBitmap);
Jeff Brown5541de92011-04-11 11:54:25 -0700214
215 SkPaint paint;
216 paint.setXfermodeMode(SkXfermode::kSrc_Mode);
Jeff Brown2352b972011-04-12 22:39:53 -0700217 surfaceCanvas.drawBitmap(update.state.icon.bitmap, 0, 0, &paint);
Jeff Brown5541de92011-04-11 11:54:25 -0700218
Michael Wright4d8779f2013-10-16 14:01:50 -0700219 if (outBuffer.width > update.state.icon.bitmap.width()) {
Jeff Brown5541de92011-04-11 11:54:25 -0700220 paint.setColor(0); // transparent fill color
Jeff Brown2352b972011-04-12 22:39:53 -0700221 surfaceCanvas.drawRectCoords(update.state.icon.bitmap.width(), 0,
Mathias Agopian52800612013-02-14 17:11:20 -0800222 outBuffer.width, update.state.icon.bitmap.height(), paint);
Jeff Brown5541de92011-04-11 11:54:25 -0700223 }
Michael Wright4d8779f2013-10-16 14:01:50 -0700224 if (outBuffer.height > update.state.icon.bitmap.height()) {
Jeff Brown5541de92011-04-11 11:54:25 -0700225 paint.setColor(0); // transparent fill color
Jeff Brown2352b972011-04-12 22:39:53 -0700226 surfaceCanvas.drawRectCoords(0, update.state.icon.bitmap.height(),
Mathias Agopian52800612013-02-14 17:11:20 -0800227 outBuffer.width, outBuffer.height, paint);
Jeff Brown5541de92011-04-11 11:54:25 -0700228 }
229
230 status = surface->unlockAndPost();
231 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000232 ALOGE("Error %d unlocking and posting sprite surface after drawing.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700233 } else {
234 update.state.surfaceDrawn = true;
235 update.surfaceChanged = surfaceChanged = true;
236 }
237 }
238 }
239 }
240
241 // Set sprite surface properties and make them visible.
242 bool haveTransaction = false;
243 for (size_t i = 0; i < numSprites; i++) {
244 SpriteUpdate& update = updates.editItemAt(i);
245
246 bool wantSurfaceVisibleAndDrawn = update.state.wantSurfaceVisible()
247 && update.state.surfaceDrawn;
248 bool becomingVisible = wantSurfaceVisibleAndDrawn && !update.state.surfaceVisible;
249 bool becomingHidden = !wantSurfaceVisibleAndDrawn && update.state.surfaceVisible;
250 if (update.state.surfaceControl != NULL && (becomingVisible || becomingHidden
251 || (wantSurfaceVisibleAndDrawn && (update.state.dirty & (DIRTY_ALPHA
252 | DIRTY_POSITION | DIRTY_TRANSFORMATION_MATRIX | DIRTY_LAYER
253 | DIRTY_VISIBILITY | DIRTY_HOTSPOT))))) {
254 status_t status;
255 if (!haveTransaction) {
Mathias Agopian439863f2011-06-28 19:09:31 -0700256 SurfaceComposerClient::openGlobalTransaction();
Jeff Brown5541de92011-04-11 11:54:25 -0700257 haveTransaction = true;
258 }
259
260 if (wantSurfaceVisibleAndDrawn
261 && (becomingVisible || (update.state.dirty & DIRTY_ALPHA))) {
262 status = update.state.surfaceControl->setAlpha(update.state.alpha);
263 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000264 ALOGE("Error %d setting sprite surface alpha.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700265 }
266 }
267
268 if (wantSurfaceVisibleAndDrawn
269 && (becomingVisible || (update.state.dirty & (DIRTY_POSITION
270 | DIRTY_HOTSPOT)))) {
271 status = update.state.surfaceControl->setPosition(
Jeff Brown2352b972011-04-12 22:39:53 -0700272 update.state.positionX - update.state.icon.hotSpotX,
273 update.state.positionY - update.state.icon.hotSpotY);
Jeff Brown5541de92011-04-11 11:54:25 -0700274 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000275 ALOGE("Error %d setting sprite surface position.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700276 }
277 }
278
279 if (wantSurfaceVisibleAndDrawn
280 && (becomingVisible
281 || (update.state.dirty & DIRTY_TRANSFORMATION_MATRIX))) {
282 status = update.state.surfaceControl->setMatrix(
283 update.state.transformationMatrix.dsdx,
284 update.state.transformationMatrix.dtdx,
285 update.state.transformationMatrix.dsdy,
286 update.state.transformationMatrix.dtdy);
287 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000288 ALOGE("Error %d setting sprite surface transformation matrix.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700289 }
290 }
291
292 int32_t surfaceLayer = mOverlayLayer + update.state.layer;
293 if (wantSurfaceVisibleAndDrawn
294 && (becomingVisible || (update.state.dirty & DIRTY_LAYER))) {
295 status = update.state.surfaceControl->setLayer(surfaceLayer);
296 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000297 ALOGE("Error %d setting sprite surface layer.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700298 }
299 }
300
301 if (becomingVisible) {
Jeff Brown4fd42e52012-08-26 22:49:01 -0700302 status = update.state.surfaceControl->show();
Jeff Brown5541de92011-04-11 11:54:25 -0700303 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000304 ALOGE("Error %d showing sprite surface.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700305 } else {
306 update.state.surfaceVisible = true;
307 update.surfaceChanged = surfaceChanged = true;
308 }
309 } else if (becomingHidden) {
310 status = update.state.surfaceControl->hide();
311 if (status) {
Steve Block3762c312012-01-06 19:20:56 +0000312 ALOGE("Error %d hiding sprite surface.", status);
Jeff Brown5541de92011-04-11 11:54:25 -0700313 } else {
314 update.state.surfaceVisible = false;
315 update.surfaceChanged = surfaceChanged = true;
316 }
317 }
318 }
319 }
320
321 if (haveTransaction) {
Mathias Agopian439863f2011-06-28 19:09:31 -0700322 SurfaceComposerClient::closeGlobalTransaction();
Jeff Brown5541de92011-04-11 11:54:25 -0700323 }
324
325 // If any surfaces were changed, write back the new surface properties to the sprites.
326 if (surfaceChanged) { // acquire lock
327 AutoMutex _l(mLock);
328
329 for (size_t i = 0; i < numSprites; i++) {
330 const SpriteUpdate& update = updates.itemAt(i);
331
332 if (update.surfaceChanged) {
333 update.sprite->setSurfaceLocked(update.state.surfaceControl,
334 update.state.surfaceWidth, update.state.surfaceHeight,
335 update.state.surfaceDrawn, update.state.surfaceVisible);
336 }
337 }
338 } // release lock
339
340 // Clear the sprite update vector outside the lock. It is very important that
341 // we do not clear sprite references inside the lock since we could be releasing
342 // the last remaining reference to the sprite here which would result in the
343 // sprite being deleted and the lock being reacquired by the sprite destructor
344 // while already held.
345 updates.clear();
346}
347
348void SpriteController::doDisposeSurfaces() {
349 // Collect disposed surfaces.
350 Vector<sp<SurfaceControl> > disposedSurfaces;
351 { // acquire lock
Jeff Brown2352b972011-04-12 22:39:53 -0700352 AutoMutex _l(mLock);
353
354 disposedSurfaces = mLocked.disposedSurfaces;
355 mLocked.disposedSurfaces.clear();
Jeff Brown5541de92011-04-11 11:54:25 -0700356 } // release lock
357
358 // Release the last reference to each surface outside of the lock.
359 // We don't want the surfaces to be deleted while we are holding our lock.
360 disposedSurfaces.clear();
361}
362
363void SpriteController::ensureSurfaceComposerClient() {
364 if (mSurfaceComposerClient == NULL) {
365 mSurfaceComposerClient = new SurfaceComposerClient();
366 }
367}
368
369sp<SurfaceControl> SpriteController::obtainSurface(int32_t width, int32_t height) {
370 ensureSurfaceComposerClient();
371
372 sp<SurfaceControl> surfaceControl = mSurfaceComposerClient->createSurface(
Jeff Brown64a55af2012-08-26 02:47:39 -0700373 String8("Sprite"), width, height, PIXEL_FORMAT_RGBA_8888,
374 ISurfaceComposerClient::eHidden);
Mathias Agopian52800612013-02-14 17:11:20 -0800375 if (surfaceControl == NULL || !surfaceControl->isValid()) {
Steve Block3762c312012-01-06 19:20:56 +0000376 ALOGE("Error creating sprite surface.");
Jeff Brown5541de92011-04-11 11:54:25 -0700377 return NULL;
378 }
379 return surfaceControl;
380}
381
382
383// --- SpriteController::SpriteImpl ---
384
385SpriteController::SpriteImpl::SpriteImpl(const sp<SpriteController> controller) :
Jeff Brown2352b972011-04-12 22:39:53 -0700386 mController(controller) {
Jeff Brown5541de92011-04-11 11:54:25 -0700387}
388
389SpriteController::SpriteImpl::~SpriteImpl() {
390 AutoMutex _m(mController->mLock);
391
392 // Let the controller take care of deleting the last reference to sprite
393 // surfaces so that we do not block the caller on an IPC here.
Jeff Brown2352b972011-04-12 22:39:53 -0700394 if (mLocked.state.surfaceControl != NULL) {
395 mController->disposeSurfaceLocked(mLocked.state.surfaceControl);
396 mLocked.state.surfaceControl.clear();
Jeff Brown5541de92011-04-11 11:54:25 -0700397 }
398}
399
Jeff Brown2352b972011-04-12 22:39:53 -0700400void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) {
Jeff Brown5541de92011-04-11 11:54:25 -0700401 AutoMutex _l(mController->mLock);
402
Jeff Brown2352b972011-04-12 22:39:53 -0700403 uint32_t dirty;
404 if (icon.isValid()) {
Leon Scrogginscc11f152014-03-31 16:52:13 -0400405 icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kNative_8888_SkColorType);
Jeff Brown5541de92011-04-11 11:54:25 -0700406
Jeff Brown2352b972011-04-12 22:39:53 -0700407 if (!mLocked.state.icon.isValid()
408 || mLocked.state.icon.hotSpotX != icon.hotSpotX
409 || mLocked.state.icon.hotSpotY != icon.hotSpotY) {
410 mLocked.state.icon.hotSpotX = icon.hotSpotX;
411 mLocked.state.icon.hotSpotY = icon.hotSpotY;
412 dirty = DIRTY_BITMAP | DIRTY_HOTSPOT;
413 } else {
414 dirty = DIRTY_BITMAP;
415 }
416 } else if (mLocked.state.icon.isValid()) {
417 mLocked.state.icon.bitmap.reset();
418 dirty = DIRTY_BITMAP | DIRTY_HOTSPOT;
419 } else {
420 return; // setting to invalid icon and already invalid so nothing to do
Jeff Brown5541de92011-04-11 11:54:25 -0700421 }
422
423 invalidateLocked(dirty);
424}
425
426void SpriteController::SpriteImpl::setVisible(bool visible) {
427 AutoMutex _l(mController->mLock);
428
Jeff Brown2352b972011-04-12 22:39:53 -0700429 if (mLocked.state.visible != visible) {
430 mLocked.state.visible = visible;
Jeff Brown5541de92011-04-11 11:54:25 -0700431 invalidateLocked(DIRTY_VISIBILITY);
432 }
433}
434
435void SpriteController::SpriteImpl::setPosition(float x, float y) {
436 AutoMutex _l(mController->mLock);
437
Jeff Brown2352b972011-04-12 22:39:53 -0700438 if (mLocked.state.positionX != x || mLocked.state.positionY != y) {
439 mLocked.state.positionX = x;
440 mLocked.state.positionY = y;
Jeff Brown5541de92011-04-11 11:54:25 -0700441 invalidateLocked(DIRTY_POSITION);
442 }
443}
444
445void SpriteController::SpriteImpl::setLayer(int32_t layer) {
446 AutoMutex _l(mController->mLock);
447
Jeff Brown2352b972011-04-12 22:39:53 -0700448 if (mLocked.state.layer != layer) {
449 mLocked.state.layer = layer;
Jeff Brown5541de92011-04-11 11:54:25 -0700450 invalidateLocked(DIRTY_LAYER);
451 }
452}
453
454void SpriteController::SpriteImpl::setAlpha(float alpha) {
455 AutoMutex _l(mController->mLock);
456
Jeff Brown2352b972011-04-12 22:39:53 -0700457 if (mLocked.state.alpha != alpha) {
458 mLocked.state.alpha = alpha;
Jeff Brown5541de92011-04-11 11:54:25 -0700459 invalidateLocked(DIRTY_ALPHA);
460 }
461}
462
463void SpriteController::SpriteImpl::setTransformationMatrix(
464 const SpriteTransformationMatrix& matrix) {
465 AutoMutex _l(mController->mLock);
466
Jeff Brown2352b972011-04-12 22:39:53 -0700467 if (mLocked.state.transformationMatrix != matrix) {
468 mLocked.state.transformationMatrix = matrix;
Jeff Brown5541de92011-04-11 11:54:25 -0700469 invalidateLocked(DIRTY_TRANSFORMATION_MATRIX);
470 }
471}
472
Jeff Brown5541de92011-04-11 11:54:25 -0700473void SpriteController::SpriteImpl::invalidateLocked(uint32_t dirty) {
Jeff Brown2352b972011-04-12 22:39:53 -0700474 bool wasDirty = mLocked.state.dirty;
475 mLocked.state.dirty |= dirty;
476
477 if (!wasDirty) {
478 mController->invalidateSpriteLocked(this);
Jeff Brown5541de92011-04-11 11:54:25 -0700479 }
480}
481
482} // namespace android