commit ef445f191b2d4a9a790f2ddd15a3633b41b097e6
author Joe Malin <jmalin@google.com> Thu Jun 20 16:22:55 2013 -0700
committer Joe Malin <jmalin@google.com> Fri Jun 21 11:00:13 2013 -0700
tree 5873789a9e7f2da4e9eb5253ec86f875bbde0ae5
parent 446792ba75459908d4f9ad322c08566a52e1f91e

Bug 9517413: Activity Detection tutorial has errors

Change-Id: I48d0986053262cd0ce3e20b280e4aa0f2151fc05

docs/html/training/location/activity-recognition.jd

diff --git a/docs/html/training/location/activity-recognition.jd b/docs/html/training/location/activity-recognition.jd
index 79804db..47ba5f8 100644
--- a/docs/html/training/location/activity-recognition.jd
+++ b/docs/html/training/location/activity-recognition.jd
@@ -171,11 +171,9 @@
             return true;
         // Google Play services was not available for some reason
         } else {
-            // Get the error code
-            int errorCode = connectionResult.getErrorCode();
             // Get the error dialog from Google Play services
             Dialog errorDialog = GooglePlayServicesUtil.getErrorDialog(
-                    errorCode,
+                    resultCode,
                     this,
                     CONNECTION_FAILURE_RESOLUTION_REQUEST);
 
@@ -649,7 +647,7 @@
 public class MainActivity extends FragmentActivity implements
         ConnectionCallbacks, OnConnectionFailedListener {
     ...
-    public enum REQUEST_TYPE = {START, STOP}
+    public enum REQUEST_TYPE {START, STOP}
     private REQUEST_TYPE mRequestType;
     ...
 }
@@ -664,7 +662,7 @@
     ...
     public void startUpdates() {
         // Set the request type to START
-        mRequestType = START;
+        mRequestType = REQUEST_TYPE.START;
         /*
          * Test for Google Play services after setting the request type.
          * If Google Play services isn't present, the proper request type
@@ -686,9 +684,16 @@
                  */
                 mActivityRecognitionClient.requestActivityUpdates(
                         DETECTION_INTERVAL_MILLISECONDS,
-                        mActivityRecognitionPendingIntent());
+                        mActivityRecognitionPendingIntent);
                 break;
-            ...
+                ...
+                /*
+                 * An enum was added to the definition of REQUEST_TYPE,
+                 * but it doesn't match a known case. Throw an exception.
+                 */
+                default :
+                throw new Exception("Unknown request type in onConnected().");
+                break;
         }
         ...
     }
@@ -712,7 +717,7 @@
      */
     public void stopUpdates() {
         // Set the request type to STOP
-        mRequestType = STOP;
+        mRequestType = REQUEST_TYPE.STOP;
         /*
          * Test for Google Play services after setting the request type.
          * If Google Play services isn't present, the request can be
@@ -760,7 +765,7 @@
             mActivityRecognitionClient.removeActivityUpdates(
                     mActivityRecognitionPendingIntent);
             break;
-
+            ...
         }
         ...
     }