commit 0b6d4aed033c774f044691d163040c2e8a115f8a
author Mathias Agopian <mathias@google.com> Sat Aug 21 09:43:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 21 09:43:24 2010 -0700
tree c118798045e0c5081bae40840ec50c71e7ed7d81
parent 302b93a47bb66f4dc7cb3a1dacf9f469075c8926
parent a90a1e55c60604b930eecff03fe25429205ec7df

am a90a1e55: am 545eab8a: Merge "remove unused pixel format" into gingerbread

Merge commit 'a90a1e55c60604b930eecff03fe25429205ec7df'

* commit 'a90a1e55c60604b930eecff03fe25429205ec7df':
  remove unused pixel format

libs/ui/PixelFormat.cpp

diff --git a/libs/ui/PixelFormat.cpp b/libs/ui/PixelFormat.cpp
index edf1aed..ee186c8 100644
--- a/libs/ui/PixelFormat.cpp
+++ b/libs/ui/PixelFormat.cpp
@@ -63,7 +63,6 @@
         info->bitsPerPixel = 16;
         goto done;
     case HAL_PIXEL_FORMAT_YCrCb_420_SP:
-    case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
     case HAL_PIXEL_FORMAT_YV12:
         info->bitsPerPixel = 12;
      done:

services/surfaceflinger/TextureManager.cpp

diff --git a/services/surfaceflinger/TextureManager.cpp b/services/surfaceflinger/TextureManager.cpp
index 0f448e0..76f6159 100644
--- a/services/surfaceflinger/TextureManager.cpp
+++ b/services/surfaceflinger/TextureManager.cpp
@@ -121,7 +121,6 @@
     case HAL_PIXEL_FORMAT_YCbCr_422_SP:
     case HAL_PIXEL_FORMAT_YCrCb_420_SP:
     case HAL_PIXEL_FORMAT_YCbCr_422_I:
-    case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
         return true;
     }