diff --git a/api/current.txt b/api/current.txt
index 7055fb3167c68..cd02d04bfcb92 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5531,6 +5531,7 @@ package android.content {
     field public static final java.lang.String CATEGORY_HE_DESK_DOCK = "android.intent.category.HE_DESK_DOCK";
     field public static final java.lang.String CATEGORY_HOME = "android.intent.category.HOME";
     field public static final java.lang.String CATEGORY_INFO = "android.intent.category.INFO";
+    field public static final java.lang.String CATEGORY_KB_DOCK = "android.intent.category.KB_DOCK";
     field public static final java.lang.String CATEGORY_LAUNCHER = "android.intent.category.LAUNCHER";
     field public static final java.lang.String CATEGORY_LE_DESK_DOCK = "android.intent.category.LE_DESK_DOCK";
     field public static final java.lang.String CATEGORY_MONKEY = "android.intent.category.MONKEY";
@@ -5540,7 +5541,6 @@ package android.content {
     field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE";
     field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";
     field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";
-    field public static final java.lang.String CATEGORY_TF101_KB_DOCK = "android.intent.category.TF101_KB_DOCK";
     field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";
     field public static final android.os.Parcelable.Creator CREATOR;
     field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
@@ -5557,8 +5557,8 @@ package android.content {
     field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2
     field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1
     field public static final int EXTRA_DOCK_STATE_HE_DESK = 4; // 0x4
+    field public static final int EXTRA_DOCK_STATE_KB = 10; // 0xa
     field public static final int EXTRA_DOCK_STATE_LE_DESK = 3; // 0x3
-    field public static final int EXTRA_DOCK_STATE_TF101_KB = 10; // 0xa
     field public static final int EXTRA_DOCK_STATE_UNDOCKED = 0; // 0x0
     field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
     field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";
@@ -6255,6 +6255,8 @@ package android.content.pm {
     field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";
     field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
     field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";
+    field public static final java.lang.String FEATURE_HALL_SENSOR = "asus.hardware.hall_sensor";
+    field public static final java.lang.String FEATURE_KB_DOCK = "asus.hardware.dock";
     field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";
     field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";
     field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
@@ -6274,8 +6276,6 @@ package android.content.pm {
     field public static final java.lang.String FEATURE_TELEPHONY = "android.hardware.telephony";
     field public static final java.lang.String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
     field public static final java.lang.String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
-    field public static final java.lang.String FEATURE_TF101_HALL_SENSOR = "asus.hardware.hall_sensor";
-    field public static final java.lang.String FEATURE_TF101_KB_DOCK = "asus.hardware.dock";
     field public static final java.lang.String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
     field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
     field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";
@@ -6654,6 +6654,7 @@ package android.content.res {
     method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;
     method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
+    method public final void updateStringCache();
   }
 
   public static class Resources.NotFoundException extends java.lang.RuntimeException {
@@ -10950,7 +10951,7 @@ package android.media {
   public static abstract interface MediaPlayer.OnInfoListener {
     method public abstract boolean onInfo(android.media.MediaPlayer, int, int);
   }
-  
+
   public static abstract interface MediaPlayer.OnParse3dFileListener {
     method public abstract int onParse3dFile(int);
   }
@@ -10966,7 +10967,7 @@ package android.media {
   public static abstract interface MediaPlayer.OnVideoSizeChangedListener {
     method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
   }
-  
+
   public static class MediaPlayer.SubInfo {
     ctor public MediaPlayer.SubInfo(byte[], java.lang.String, int);
     field public java.lang.String charset;
@@ -17735,6 +17736,7 @@ package android.provider {
     field public static final java.lang.String MODE_RINGER = "mode_ringer";
     field public static final java.lang.String MODE_RINGER_STREAMS_AFFECTED = "mode_ringer_streams_affected";
     field public static final java.lang.String MUTE_STREAMS_AFFECTED = "mute_streams_affected";
+    field public static final java.lang.String NAVIGATION_BAR_WIDGETS = "navigation_bar_widgets";
     field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
     field public static final java.lang.String NEXT_ALARM_FORMATTED = "next_alarm_formatted";
     field public static final java.lang.String NOTIFICATION_SOUND = "notification_sound";
@@ -22049,11 +22051,10 @@ package android.view {
     method public deprecated int getWidth();
     field public static final int DEFAULT_DISPLAY = 0; // 0x0
   }
-  
+
   public class DisplayManager {
     ctor public DisplayManager();
     method public int closeDisplay(int);
-    method public int getDisplayBacklightMode();
     method public int getDisplayCount();
     method public int getDisplayHeight(int);
     method public int getDisplayHotPlugStatus(int);
@@ -22067,7 +22068,6 @@ package android.view {
     method public int getMaxHdmiMode();
     method public int getMaxWidthDisplay();
     method public int openDisplay(int);
-    method public int setDisplayBacklightMode(int);
     method public int setDisplayMaster(int);
     method public int setDisplayMode(int);
     method public int setDisplayOutputType(int, int, int);
@@ -22461,7 +22461,6 @@ package android.view {
     field public static final int KEYCODE_B = 30; // 0x1e
     field public static final int KEYCODE_BACK = 4; // 0x4
     field public static final int KEYCODE_BACKSLASH = 73; // 0x49
-    field public static final int KEYCODE_BLUETOOTH = 221; // 0xdd
     field public static final int KEYCODE_BOOKMARK = 174; // 0xae
     field public static final int KEYCODE_BREAK = 121; // 0x79
     field public static final int KEYCODE_BRIGHTNESS_AUTO = 216; // 0xd8
@@ -22505,7 +22504,6 @@ package android.view {
     field public static final int KEYCODE_CAMERA = 27; // 0x1b
     field public static final int KEYCODE_CAPS_LOCK = 115; // 0x73
     field public static final int KEYCODE_CAPTIONS = 175; // 0xaf
-    field public static final int KEYCODE_CAPTURE = 226; // 0xe2
     field public static final int KEYCODE_CHANNEL_DOWN = 167; // 0xa7
     field public static final int KEYCODE_CHANNEL_UP = 166; // 0xa6
     field public static final int KEYCODE_CLEAR = 28; // 0x1c
@@ -22522,14 +22520,11 @@ package android.view {
     field public static final int KEYCODE_DPAD_UP = 19; // 0x13
     field public static final int KEYCODE_DVR = 173; // 0xad
     field public static final int KEYCODE_E = 33; // 0x21
-    field public static final int KEYCODE_EISU = 212; // 0xd4
     field public static final int KEYCODE_ENDCALL = 6; // 0x6
     field public static final int KEYCODE_ENTER = 66; // 0x42
     field public static final int KEYCODE_ENVELOPE = 65; // 0x41
     field public static final int KEYCODE_EQUALS = 70; // 0x46
     field public static final int KEYCODE_ESCAPE = 111; // 0x6f
-    field public static final int KEYCODE_EUROPE_1 = 217; // 0xd9
-    field public static final int KEYCODE_EUROPE_2 = 218; // 0xda
     field public static final int KEYCODE_EXPLORER = 64; // 0x40
     field public static final int KEYCODE_F = 34; // 0x22
     field public static final int KEYCODE_F1 = 131; // 0x83
@@ -22552,10 +22547,7 @@ package android.view {
     field public static final int KEYCODE_GRAVE = 68; // 0x44
     field public static final int KEYCODE_GUIDE = 172; // 0xac
     field public static final int KEYCODE_H = 36; // 0x24
-    field public static final int KEYCODE_HANKAKU_ZENKAKU = 211; // 0xd3
     field public static final int KEYCODE_HEADSETHOOK = 79; // 0x4f
-    field public static final int KEYCODE_HENKAN = 214; // 0xd6
-    field public static final int KEYCODE_HIRAGANA_KATAKANA = 215; // 0xd7
     field public static final int KEYCODE_HOME = 3; // 0x3
     field public static final int KEYCODE_I = 37; // 0x25
     field public static final int KEYCODE_INFO = 165; // 0xa5
@@ -22584,7 +22576,6 @@ package android.view {
     field public static final int KEYCODE_MINUS = 69; // 0x45
     field public static final int KEYCODE_MOVE_END = 123; // 0x7b
     field public static final int KEYCODE_MOVE_HOME = 122; // 0x7a
-    field public static final int KEYCODE_MUHENKAN = 213; // 0xd5
     field public static final int KEYCODE_MUSIC = 209; // 0xd1
     field public static final int KEYCODE_MUTE = 91; // 0x5b
     field public static final int KEYCODE_N = 42; // 0x2a
@@ -22636,7 +22627,6 @@ package android.view {
     field public static final int KEYCODE_SHIFT_LEFT = 59; // 0x3b
     field public static final int KEYCODE_SHIFT_RIGHT = 60; // 0x3c
     field public static final int KEYCODE_SLASH = 76; // 0x4c
-    field public static final int KEYCODE_SLEEP = 219; // 0xdb
     field public static final int KEYCODE_SOFT_LEFT = 1; // 0x1
     field public static final int KEYCODE_SOFT_RIGHT = 2; // 0x2
     field public static final int KEYCODE_SPACE = 62; // 0x3e
@@ -22649,7 +22639,7 @@ package android.view {
     field public static final int KEYCODE_T = 48; // 0x30
     field public static final int KEYCODE_TAB = 61; // 0x3d
     field public static final int KEYCODE_TOGGLE_BT = 212; // 0xd4
-    field public static final int KEYCODE_TOUCHPAD = 213; // 0xd5
+    field public static final int KEYCODE_TOGGLE_TOUCHPAD = 213; // 0xd5
     field public static final int KEYCODE_TOGGLE_WIFI = 211; // 0xd3
     field public static final int KEYCODE_TV = 170; // 0xaa
     field public static final int KEYCODE_TV_INPUT = 178; // 0xb2
@@ -22662,10 +22652,8 @@ package android.view {
     field public static final int KEYCODE_VOLUME_UP = 24; // 0x18
     field public static final int KEYCODE_W = 51; // 0x33
     field public static final int KEYCODE_WINDOW = 171; // 0xab
-    field public static final int KEYCODE_WIRELESS = 220; // 0xdc
     field public static final int KEYCODE_X = 52; // 0x34
     field public static final int KEYCODE_Y = 53; // 0x35
-    field public static final int KEYCODE_YEN = 216; // 0xd8
     field public static final int KEYCODE_Z = 54; // 0x36
     field public static final int KEYCODE_ZOOM_IN = 168; // 0xa8
     field public static final int KEYCODE_ZOOM_OUT = 169; // 0xa9
@@ -22920,6 +22908,7 @@ package android.view {
     method public static android.view.MotionEvent obtainNoHistory(android.view.MotionEvent);
     method public final void offsetLocation(float, float);
     method public final void recycle();
+    method public final void scale(float, float);
     method public final void setAction(int);
     method public final void setEdgeFlags(int);
     method public final void setLocation(float, float);
diff --git a/core/java/android/view/DisplayManager.java b/core/java/android/view/DisplayManager.java
index a752a4648cc8d..3f61de80ab213 100644
--- a/core/java/android/view/DisplayManager.java
+++ b/core/java/android/view/DisplayManager.java
@@ -246,7 +246,6 @@ public int setDisplayMode(int mode)
 		try 
 		{
 			Log.d(TAG,"setDisplayMode");
-			setDisplayBacklightMode(1);
             return  mService.setDisplayMode(mode);
         } 
         catch (RemoteException ex) 
@@ -311,19 +310,6 @@ public int closeDisplay(int mDisplay)
             return -1;
         }
 	}
-    
-	public int setDisplayBacklightMode(int mode)
-	{
-		try
-		{
-			Log.d(TAG,"11111111111111111111111111111111111111111111111111111111111111111111111111111111111");
-			return mService.setDisplayBacklightMode(mode);
-		}
-		catch (RemoteException ex)
-		{
-			return -1;
-		}
-	}
 	
 	public int setDisplayMaster(int mDisplay)
 	{
@@ -382,17 +368,5 @@ public int getMaxHdmiMode()
             return -1;
         }
 	}
-	public int getDisplayBacklightMode()
-	{
-		try
-		{
-			// get display backlight mode
-			return mService.getDisplayBacklightMode();
-		}
-		catch (RemoteException ex)
-		{
-			return -1;
-		}
-	}
 }
 
diff --git a/core/java/android/view/IDisplayManager.aidl b/core/java/android/view/IDisplayManager.aidl
index de9f1ff78d106..db18ff44301db 100644
--- a/core/java/android/view/IDisplayManager.aidl
+++ b/core/java/android/view/IDisplayManager.aidl
@@ -49,6 +49,4 @@ interface IDisplayManager
 	int getDisplayMaster();
 	int getMaxWidthDisplay();
 	int getMaxHdmiMode();
-	int setDisplayBacklightMode(int mode);
-	int getDisplayBacklightMode();
 }
diff --git a/include/camera/Camera.h b/include/camera/Camera.h
index 5e041d657cc5c..43416290f38ec 100644
--- a/include/camera/Camera.h
+++ b/include/camera/Camera.h
@@ -25,6 +25,14 @@
 #include <camera/ICameraRecordingProxyListener.h>
 
 namespace android {
+  
+#define MASTER_SCREEN        0
+#define SLAVE_SCREEN         1
+	
+#define PROP_CAMERA_KEY             "media.camera.screen"
+#define PROP_MASTER_SCREEN          "master"
+#define PROP_SLAVE_SCREEN           "slave"
+#define PROP_SCREEN_DEFAULT_VALUE   PROP_MASTER_SCREEN
 
 struct CameraInfo {
     /**
diff --git a/include/ui/DisplayDispatcher.h b/include/ui/DisplayDispatcher.h
index 593a150da8e82..844d19df9a898 100644
--- a/include/ui/DisplayDispatcher.h
+++ b/include/ui/DisplayDispatcher.h
@@ -50,7 +50,6 @@
 #define   DISPLAY_CMD_GETDISPLAYMODE    11
 #define   DISPLAY_CMD_GETDISPCOUNT      12
 #define   DISPLAY_CMD_SETDISPMODE       13
-#define   DISPLAY_CMD_SETBACKLIGHTMODE  14
 namespace android 
 {
     /* 同显时的帧管理线程 */
@@ -101,7 +100,6 @@ namespace android
 			int 	getDisplayCount();
 			int		getMaxWidthDisplay();
 			int     getMaxHdmiMode();
-			int     setDisplayBacklightMode(int mode);
 			
 			bool 	mDisplayOpen0;
 	        bool 	mDisplayOpen1;
diff --git a/libs/ui/DisplayDispatcher.cpp b/libs/ui/DisplayDispatcher.cpp
index 1cccfa584fda0..e6cba5c830052 100644
--- a/libs/ui/DisplayDispatcher.cpp
+++ b/libs/ui/DisplayDispatcher.cpp
@@ -418,15 +418,7 @@ namespace android
 		
 		return  -1;
     }
-	int DisplayDispatcher::setDisplayBacklightMode(int mode)
-	{
-		  if(mDevice)
-		  {
-		  		return mDevice->setdisplaybacklightmode(mDevice,mode);
-		  }
-		  
-		  return -1;
-	}
+
     int DisplayDispatcher::setDispProp(int cmd,int param0,int param1,int param2)		
     {
         switch(cmd)
@@ -472,9 +464,6 @@ namespace android
 
             case DISPLAY_CMD_SETDISPMODE:
                 return  setDisplayMode(param0);
-                
-			case DISPLAY_CMD_SETBACKLIGHTMODE:
-				return  setDisplayBacklightMode(param0);
 				
             default:
                 LOGE("Display Cmd not Support!\n");
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index e499afef59ffc..ab90f1f14a197 100755
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -281,7 +281,7 @@ public static boolean isAudioFileType(int fileType) {
         return ((fileType >= FIRST_AUDIO_FILE_TYPE &&
                 fileType <= LAST_AUDIO_FILE_TYPE) ||
                 (fileType >= FIRST_MIDI_FILE_TYPE &&
-                fileType <= LAST_MIDI_FILE_TYPE ||
+                fileType <= LAST_MIDI_FILE_TYPE) ||
 		fileType == FILE_TYPE_CEDARA);
     }
 
diff --git a/services/java/com/android/server/DisplayManagerService.java b/services/java/com/android/server/DisplayManagerService.java
index ca8debcb8da27..87c1f855e849b 100644
--- a/services/java/com/android/server/DisplayManagerService.java
+++ b/services/java/com/android/server/DisplayManagerService.java
@@ -162,7 +162,6 @@ public class DisplayManagerService extends IDisplayManager.Stub
 	private int 			mDisplayFormat1;
 	private static 			DisplayThread sThread;
     private static 			boolean sThreadStarted = false;
-	private int             mBacklightMode;
     
     private native void nativeInit();
     private native int 	nativeGetDisplayCount();
@@ -185,7 +184,6 @@ public class DisplayManagerService extends IDisplayManager.Stub
 	private native int  nativeGetMaxWidthDisplay();
 	private native int  nativeGetMaxHdmiMode();
 	private native int  nativeSetDisplayParameter(int mDisplay,int para0,int para1);
-	private native int nativeSetDisplayBacklihgtMode(int mode);
 
 	private final void sendHdmiIntent() 
 	{
@@ -369,8 +367,8 @@ public DisplayManagerService(Context context,PowerManagerService pm)
 	        }
  		}
 		mWindowManager	= IWindowManager.Stub.asInterface(ServiceManager.getService(Context.WINDOW_SERVICE));
-		boolean enable = Settings.System.getInt(mContext.getContentResolver(),Settings.System.SMART_BRIGHTNESS_ENABLE,0) != 0 ? true : false;
-		setDisplayBacklightMode(enable?1:0);
+		//boolean enable = Settings.System.getInt(mContext.getContentResolver(),Settings.System.SMART_BRIGHTNESS_ENABLE,0) != 0 ? true : false;
+		//setDisplayBacklightMode(enable?1:0);
 		Log.d(TAG,"getWindowManager Starting.......!");
     }
     
@@ -493,17 +491,6 @@ public int getDisplayHotPlugStatus(int mDisplay)
 	{
 		return nativeGetDisplayHotPlug(mDisplay);
 	}
-
-	public int setDisplayBacklightMode(int mode)
-	{
-		mBacklightMode = mode;
-		return nativeSetDisplayBacklihgtMode(mode);
-	}
-
-	public int getDisplayBacklightMode()
-	{
-		return mBacklightMode;
-	}
 	
 	public int openDisplay(int mDisplay)
 	{
diff --git a/services/jni/com_android_server_DisplayManagerService.cpp b/services/jni/com_android_server_DisplayManagerService.cpp
index 1f657996bceb1..e1148c8f2bd49 100644
--- a/services/jni/com_android_server_DisplayManagerService.cpp
+++ b/services/jni/com_android_server_DisplayManagerService.cpp
@@ -692,14 +692,6 @@ namespace android
 	    return  (jint)gNativeDisplayManager->getDisplayParameter(displayno,DISPLAY_OUTPUT_HOTPLUG);
     }
 	
-    static jint SetDisplayBacklihgtMode_native(JNIEnv *env, jobject clazz,int mode)
-    {
-		 
-		return	SurfaceComposerClient::setDisplayProp(DISPLAY_CMD_SETBACKLIGHTMODE,mode,0,0);
-		
-
-    }
-
 
 static JNINativeMethod method_table[] = {
     { "nativeInit", "()V", (void*)init_native },
@@ -723,7 +715,6 @@ static JNINativeMethod method_table[] = {
     { "nativeGetDisplayPixelFormat", "(I)I", (void*)getDisplayOutputPixelFormat_native },
     { "nativeGetDisplayOpen", "(I)I", (void*)getDisplayOutputOpen_native },
     { "nativeGetDisplayHotPlug", "(I)I", (void*)getDisplayOutputHotPlug_native },
-    { "nativeSetDisplayBacklihgtMode", "(I)I", (void*)SetDisplayBacklihgtMode_native },
     
 };
 
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 66a7593e91386..b82b036b4e678 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -41,12 +41,10 @@
 
 #ifdef QCOM_HARDWARE
 #include <qcom_ui.h>
+#define SHIFT_SRC_TRANSFORM 4
 #endif
 
 #define DEBUG_RESIZE    0
-#ifdef QCOM_HARDWARE
-#define SHIFT_SRC_TRANSFORM 4
-#endif
 
 namespace android {
 
@@ -72,12 +70,12 @@ Layer::Layer(SurfaceFlinger* flinger,
 {
     mCurrentCrop.makeInvalid();
     glGenTextures(1, &mTextureName);
+    texture_srcw 	= 0;
+    texture_srch 	= 0;
+    texture_format 	= 0;
 #ifdef QCOM_HARDWARE
     updateLayerQcomFlags(LAYER_UPDATE_STATUS, true, mLayerQcomFlags);
 #endif
-    texture_srcw       = 0;
-    texture_srch       = 0;
-    texture_format     = 0;
 }
 
 void Layer::onFirstRef()
@@ -161,7 +159,6 @@ void Layer::setTextureInfo(int w,int h,int format)
     texture_format 	= format;
     mCurrentCrop    = Rect(w,h);
 }
-
 status_t Layer::setBuffers( uint32_t w, uint32_t h,
                             PixelFormat format, uint32_t flags)
 {
@@ -294,12 +291,14 @@ void Layer::setPerFrameData(hwc_layer_t* hwcl) {
     } else {
         hwcl->handle = buffer->handle;
     }
+
+    hwcl->format = texture_format;
+    LOGV("hwcl->format = %d\n",texture_format);
+
 #ifdef QCOM_HARDWARE
     updateLayerQcomFlags(LAYER_ASYNCHRONOUS_STATUS, !mSurfaceTexture->isSynchronousMode(), mLayerQcomFlags);
     hwcl->flags = getPerFrameFlags(hwcl->flags, mLayerQcomFlags);
 #endif
-    hwcl->format = texture_format;
-    LOGV("hwcl->format = %d\n",texture_format);
 }
 
 void Layer::onDraw(const Region& clip) const
@@ -310,7 +309,7 @@ void Layer::onDraw(const Region& clip) const
     }
     else
     {
-        if (CC_UNLIKELY(mActiveBuffer == 0)) {
+    if (CC_UNLIKELY(mActiveBuffer == 0)) {
         // the texture has not been created yet, this Layer has
         // in fact never been drawn into. This happens frequently with
         // SurfaceView because the WindowManager can't know when the client
@@ -340,7 +339,7 @@ void Layer::onDraw(const Region& clip) const
 #endif
         }
         return;
-        }
+    }
 
 #ifdef QCOM_HARDWARE
 	if (!isGPUSupportedFormat(mActiveBuffer->format)) {
@@ -413,11 +412,13 @@ void Layer::onDraw(const Region& clip) const
 
     glDisable(GL_TEXTURE_EXTERNAL_OES);
     glDisable(GL_TEXTURE_2D);
+
 #ifdef QCOM_HARDWARE
     if(needsDithering()) {
         glDisable(GL_DITHER);
     }
 #endif
+  }
 }
 
 // As documented in libhardware header, formats in the range
@@ -638,10 +639,6 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
                     bufWidth, bufHeight, mCurrentTransform,
                     front.requested_w, front.requested_h);
         }
-#ifdef QCOM_HARDWARE
-    } else {
-        updateLayerQcomFlags(LAYER_UPDATE_STATUS, false, mLayerQcomFlags);
-#endif
     }
     else if(texture_format != 0)
     {