Merge branch 'gingerbread' into gingerbread-release

38 files changed, 19 insertions, 9 deletions

diff --git a/Android.mk b/Android.mk
index 1c8051b8d6cd..83bdc0e50541 100644
--- a/Android.mk
+++ b/Android.mk
@@ -435,7 +435,9 @@ web_docs_sample_code_flags := \
 		-samplecode $(sample_dir)/WiktionarySimple \
 		            resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
 		-samplecode $(sample_dir)/VoiceRecognitionService \
-		            resources/samples/VoiceRecognitionService "Voice Recognition Service"
+		            resources/samples/VoiceRecognitionService "Voice Recognition Service" \
+		-samplecode $(sample_dir)/NFCDemo \
+		            resources/samples/NFCDemo "NFC Demo"
 
 ## SDK version identifiers used in the published docs
   # major[.minor] version for current SDK. (full releases only)
diff --git a/data/sounds/notifications/Altair.ogg b/data/sounds/notifications/Altair.ogg
index 8b56f916818f..660c8004cd8d 100755..100644
--- a/data/sounds/notifications/Altair.ogg
+++ b/data/sounds/notifications/Altair.ogg
diff --git a/data/sounds/notifications/Capella.ogg b/data/sounds/notifications/Capella.ogg
index 22e1d37226d7..ae4f3c535d8c 100755..100644
--- a/data/sounds/notifications/Capella.ogg
+++ b/data/sounds/notifications/Capella.ogg
diff --git a/data/sounds/notifications/Castor.ogg b/data/sounds/notifications/Castor.ogg
index 4ad22d0a0403..92de8e72a221 100755..100644
--- a/data/sounds/notifications/Castor.ogg
+++ b/data/sounds/notifications/Castor.ogg
diff --git a/data/sounds/notifications/Deneb.ogg b/data/sounds/notifications/Deneb.ogg
index 096ff0a1fb00..3b17e2870415 100755..100644
--- a/data/sounds/notifications/Deneb.ogg
+++ b/data/sounds/notifications/Deneb.ogg
diff --git a/data/sounds/notifications/Electra.ogg b/data/sounds/notifications/Electra.ogg
index 313cb6f7b214..9335d8d4a95d 100755..100644
--- a/data/sounds/notifications/Electra.ogg
+++ b/data/sounds/notifications/Electra.ogg
diff --git a/data/sounds/notifications/Fomalhaut.ogg b/data/sounds/notifications/Fomalhaut.ogg
index 39c71ad798b9..9448c186004b 100755..100644
--- a/data/sounds/notifications/Fomalhaut.ogg
+++ b/data/sounds/notifications/Fomalhaut.ogg
diff --git a/data/sounds/notifications/Polaris.ogg b/data/sounds/notifications/Polaris.ogg
index 81041780e2aa..d5b991ff29e1 100755..100644
--- a/data/sounds/notifications/Polaris.ogg
+++ b/data/sounds/notifications/Polaris.ogg
diff --git a/data/sounds/notifications/Pollux.ogg b/data/sounds/notifications/Pollux.ogg
index ede9e27424dd..d37c75cf1f84 100755..100644
--- a/data/sounds/notifications/Pollux.ogg
+++ b/data/sounds/notifications/Pollux.ogg
diff --git a/data/sounds/notifications/Procyon.ogg b/data/sounds/notifications/Procyon.ogg
index 02dbc3f1f3ce..93d1557c3929 100755..100644
--- a/data/sounds/notifications/Procyon.ogg
+++ b/data/sounds/notifications/Procyon.ogg
diff --git a/data/sounds/notifications/arcturus.ogg b/data/sounds/notifications/arcturus.ogg
index 7b61963ee118..9d73103a87e2 100644
--- a/data/sounds/notifications/arcturus.ogg
+++ b/data/sounds/notifications/arcturus.ogg
diff --git a/data/sounds/notifications/regulus.ogg b/data/sounds/notifications/regulus.ogg
index dc52054896c7..4f28d9ee125d 100644
--- a/data/sounds/notifications/regulus.ogg
+++ b/data/sounds/notifications/regulus.ogg
diff --git a/data/sounds/notifications/sirius.ogg b/data/sounds/notifications/sirius.ogg
index a54481b33e4e..78c9991e357b 100644
--- a/data/sounds/notifications/sirius.ogg
+++ b/data/sounds/notifications/sirius.ogg
diff --git a/data/sounds/ringtones/ANDROMEDA.ogg b/data/sounds/ringtones/ANDROMEDA.ogg
index 33e43e35f57c..8f6bd3e95d11 100644
--- a/data/sounds/ringtones/ANDROMEDA.ogg
+++ b/data/sounds/ringtones/ANDROMEDA.ogg
diff --git a/data/sounds/ringtones/Aquila.ogg b/data/sounds/ringtones/Aquila.ogg
index 3f9266df01cf..b391be978a80 100755..100644
--- a/data/sounds/ringtones/Aquila.ogg
+++ b/data/sounds/ringtones/Aquila.ogg
diff --git a/data/sounds/ringtones/ArgoNavis.ogg b/data/sounds/ringtones/ArgoNavis.ogg
index 11c6092a8959..b4202ac993e7 100755..100644
--- a/data/sounds/ringtones/ArgoNavis.ogg
+++ b/data/sounds/ringtones/ArgoNavis.ogg
diff --git a/data/sounds/ringtones/BOOTES.ogg b/data/sounds/ringtones/BOOTES.ogg
index 485a9f65fbb7..0716a4f881a7 100644
--- a/data/sounds/ringtones/BOOTES.ogg
+++ b/data/sounds/ringtones/BOOTES.ogg
diff --git a/data/sounds/ringtones/CANISMAJOR.ogg b/data/sounds/ringtones/CANISMAJOR.ogg
index e51d6e0bc29c..177d3dea250b 100644
--- a/data/sounds/ringtones/CANISMAJOR.ogg
+++ b/data/sounds/ringtones/CANISMAJOR.ogg
diff --git a/data/sounds/ringtones/CASSIOPEIA.ogg b/data/sounds/ringtones/CASSIOPEIA.ogg
index 0456a59f8cda..c4a7948364b2 100644
--- a/data/sounds/ringtones/CASSIOPEIA.ogg
+++ b/data/sounds/ringtones/CASSIOPEIA.ogg
diff --git a/data/sounds/ringtones/Centaurus.ogg b/data/sounds/ringtones/Centaurus.ogg
index 58b413d11205..404bdbc69c14 100755..100644
--- a/data/sounds/ringtones/Centaurus.ogg
+++ b/data/sounds/ringtones/Centaurus.ogg
diff --git a/data/sounds/ringtones/Cygnus.ogg b/data/sounds/ringtones/Cygnus.ogg
index 763926e5648a..b2e1e6561620 100755..100644
--- a/data/sounds/ringtones/Cygnus.ogg
+++ b/data/sounds/ringtones/Cygnus.ogg
diff --git a/data/sounds/ringtones/Draco.ogg b/data/sounds/ringtones/Draco.ogg
index 8749b3ac393e..88d5a04330ba 100755..100644
--- a/data/sounds/ringtones/Draco.ogg
+++ b/data/sounds/ringtones/Draco.ogg
diff --git a/data/sounds/ringtones/Lyra.ogg b/data/sounds/ringtones/Lyra.ogg
index 16d47e9db80e..696f278b62de 100755..100644
--- a/data/sounds/ringtones/Lyra.ogg
+++ b/data/sounds/ringtones/Lyra.ogg
diff --git a/data/sounds/ringtones/Machina.ogg b/data/sounds/ringtones/Machina.ogg
index ab0105ea0410..ac16f7ef3fcc 100755..100644
--- a/data/sounds/ringtones/Machina.ogg
+++ b/data/sounds/ringtones/Machina.ogg
diff --git a/data/sounds/ringtones/Orion.ogg b/data/sounds/ringtones/Orion.ogg
index 8e360241db70..807f10749775 100755..100644
--- a/data/sounds/ringtones/Orion.ogg
+++ b/data/sounds/ringtones/Orion.ogg
diff --git a/data/sounds/ringtones/Pegasus.ogg b/data/sounds/ringtones/Pegasus.ogg
index 17baaede61f2..66c497073b5b 100755..100644
--- a/data/sounds/ringtones/Pegasus.ogg
+++ b/data/sounds/ringtones/Pegasus.ogg
diff --git a/data/sounds/ringtones/Scarabaeus.ogg b/data/sounds/ringtones/Scarabaeus.ogg
index 50b9fabb2401..e70fc6967ac6 100755..100644
--- a/data/sounds/ringtones/Scarabaeus.ogg
+++ b/data/sounds/ringtones/Scarabaeus.ogg
diff --git a/data/sounds/ringtones/Sceptrum.ogg b/data/sounds/ringtones/Sceptrum.ogg
index 9be353e795b7..fc50aef575e4 100755..100644
--- a/data/sounds/ringtones/Sceptrum.ogg
+++ b/data/sounds/ringtones/Sceptrum.ogg
diff --git a/data/sounds/ringtones/Solarium.ogg b/data/sounds/ringtones/Solarium.ogg
index 2aed475fdd09..d27f141dd930 100755..100644
--- a/data/sounds/ringtones/Solarium.ogg
+++ b/data/sounds/ringtones/Solarium.ogg
diff --git a/data/sounds/ringtones/Testudo.ogg b/data/sounds/ringtones/Testudo.ogg
index 063dacfc7eaf..0ca8d6b1299d 100755..100644
--- a/data/sounds/ringtones/Testudo.ogg
+++ b/data/sounds/ringtones/Testudo.ogg
diff --git a/data/sounds/ringtones/Vespa.ogg b/data/sounds/ringtones/Vespa.ogg
index eaac1bdb19ac..4423bbb6a5ac 100755..100644
--- a/data/sounds/ringtones/Vespa.ogg
+++ b/data/sounds/ringtones/Vespa.ogg
diff --git a/data/sounds/ringtones/hydra.ogg b/data/sounds/ringtones/hydra.ogg
index b48614fccdda..edde14fde5db 100644
--- a/data/sounds/ringtones/hydra.ogg
+++ b/data/sounds/ringtones/hydra.ogg
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 117ecfb2659b..ed23c7c789b8 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -227,6 +227,9 @@
           <li><a href="<?cs var:toroot ?>resources/samples/MultiResolution/index.html">
                 <span class="en">Multiple Resolutions</span>
               </a></li>
+          <li><a href="<?cs var:toroot ?>resources/samples/NFCDemo/index.html">
+                <span class="en">NFCDemo</span>
+                </a> <span class="new">new!</span></li>
           <li><a href="<?cs var:toroot ?>resources/samples/NotePad/index.html">
                 <span class="en">Note Pad</span>
               </a></li>
diff --git a/docs/html/resources/samples/images/NfcDemo.png b/docs/html/resources/samples/images/NfcDemo.png
new file mode 100644
index 000000000000..c175d12b5d7e
--- /dev/null
+++ b/docs/html/resources/samples/images/NfcDemo.png
diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd
index cbe6ca386950..57497289e9a4 100644
--- a/docs/html/resources/samples/index.jd
+++ b/docs/html/resources/samples/index.jd
@@ -58,6 +58,9 @@ href="{@docRoot}resources/samples/get.html">Getting the Samples</a>.</p>
   <dd>A sample application that shows how to use resource directory qualifiers to
   provide different resources for different screen configurations.</dd>
 
+ <dt><a href="NFCDemo/index.html">NFCDemo</a></dt>
+  <dd>An application for reading NFC Forum Type 2 Tags using platform NFC apis.</a>.</dd>
+
  <dt><a href="NotePad/index.html">Note Pad</a></dt>
   <dd>An application for saving notes. Similar (but not identical) to the 
     <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index a277bcb012b0..43936a4e876a 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -111,7 +111,6 @@ import android.view.animation.AnimationUtils;
 import android.media.IAudioService;
 import android.media.AudioManager;
 
-import java.io.File;
 import java.util.ArrayList;
 
 /**
@@ -2115,12 +2114,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                     return getCurrentPortraitRotation(lastRotation);
             }
 
-            if (new File("/system/etc/allow_all_orientations").exists()) {
-                mOrientationListener.setAllow180Rotation(true);
-            } else {
-                mOrientationListener.setAllow180Rotation(
-                        orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
-            }
+            mOrientationListener.setAllow180Rotation(
+                    orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
 
             // case for nosensor meaning ignore sensor and consider only lid
             // or orientation sensor disabled
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index b5e73ac5e78f..22a45df0603c 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -464,6 +464,7 @@ void SensorService::SensorEventConnection::onFirstRef()
 }
 
 bool SensorService::SensorEventConnection::addSensor(int32_t handle) {
+    Mutex::Autolock _l(mConnectionLock);
     if (mSensorInfo.indexOfKey(handle) <= 0) {
         SensorInfo info;
         mSensorInfo.add(handle, info);
@@ -473,6 +474,7 @@ bool SensorService::SensorEventConnection::addSensor(int32_t handle) {
 }
 
 bool SensorService::SensorEventConnection::removeSensor(int32_t handle) {
+    Mutex::Autolock _l(mConnectionLock);
     if (mSensorInfo.removeItem(handle) >= 0) {
         return true;
     }
@@ -480,16 +482,19 @@ bool SensorService::SensorEventConnection::removeSensor(int32_t handle) {
 }
 
 bool SensorService::SensorEventConnection::hasSensor(int32_t handle) const {
+    Mutex::Autolock _l(mConnectionLock);
     return mSensorInfo.indexOfKey(handle) >= 0;
 }
 
 bool SensorService::SensorEventConnection::hasAnySensor() const {
+    Mutex::Autolock _l(mConnectionLock);
     return mSensorInfo.size() ? true : false;
 }
 
 status_t SensorService::SensorEventConnection::setEventRateLocked(
         int handle, nsecs_t ns)
 {
+    Mutex::Autolock _l(mConnectionLock);
     ssize_t index = mSensorInfo.indexOfKey(handle);
     if (index >= 0) {
         SensorInfo& info = mSensorInfo.editValueFor(handle);
@@ -506,6 +511,7 @@ status_t SensorService::SensorEventConnection::sendEvents(
     // filter out events not for this connection
     size_t count = 0;
     if (scratch) {
+        Mutex::Autolock _l(mConnectionLock);
         size_t i=0;
         while (i<numEvents) {
             const int32_t curr = buffer[i].sensor;
diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h
index b442779d5ac0..c0922f553c76 100644
--- a/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@ -75,8 +75,9 @@ class SensorService :
 
         sp<SensorService> const mService;
         sp<SensorChannel> const mChannel;
+        mutable Mutex mConnectionLock;
 
-        // protected by SensorService::mLock
+        // protected mConnectionLock
         struct SensorInfo {
             SensorInfo() : ns(DEFAULT_EVENTS_PERIOD) { }
             nsecs_t ns;