AI 143320: am: CL 143171 am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
  Original author: mathias
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143320
diff --git a/include/ui/ISurfaceComposer.h b/include/ui/ISurfaceComposer.h
index f9eeb30..5c64b22 100644
--- a/include/ui/ISurfaceComposer.h
+++ b/include/ui/ISurfaceComposer.h
@@ -81,6 +81,11 @@
         eOrientation270         = 3,
         eOrientationSwapMask    = 0x01
     };
+    
+    // flags for setOrientation
+    enum {
+        eOrientationAnimationDisable = 0x00000001
+    };
 
     /* create connection with surface flinger, requires
      * ACCESS_SURFACE_FLINGER permission
@@ -100,7 +105,7 @@
     virtual status_t unfreezeDisplay(DisplayID dpy, uint32_t flags) = 0;
 
     /* Set display orientation. recquires ACCESS_SURFACE_FLINGER permission */
-    virtual int setOrientation(DisplayID dpy, int orientation) = 0;
+    virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags) = 0;
 
     /* signal that we're done booting.
      * recquires ACCESS_SURFACE_FLINGER permission