Backout 90f7f032757f, 6695904a4a70, 50e98f67df1b & d26e8631514c (bug 697641) for native Android failures and 20289eb83e51 (bug 712378) because it conflicted with the backout CLOSED TREE

widget/android/nsAppShell.cpp

@@ -36,10 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// Make sure the order of included headers
-#include "base/basictypes.h"
-#include "nspr/prtypes.h"
-
 #include "mozilla/Hal.h"
 #include "nsAppShell.h"
 #include "nsWindow.h"
@@ -52,7 +48,6 @@
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/Hal.h"
 #include "prenv.h"
 
 #include "AndroidBridge.h"
@@ -360,15 +355,6 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
         break;
     }
 
-    case AndroidGeckoEvent::PROXIMITY_EVENT: {
-        InfallibleTArray<float> values;
-        values.AppendElement(curEvent->Distance());
-        
-        hal::SensorData sdata(hal::SENSOR_PROXIMITY, PR_Now(), values);
-        hal::NotifySensorChange(sdata);
-        break;
-    }
-
     case AndroidGeckoEvent::ACTIVITY_STOPPING: {
         nsCOMPtr<nsIObserverService> obsServ =
             mozilla::services::GetObserverService();