Merge upstream.

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="23"
+          android:versionCode="24"
-          android:versionName="1.1.0">
+          android:versionName="1.1.1">
   <application android:icon="@drawable/arrow_icon"
                android:label="@string/app_name"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">

MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java

@@ -16,6 +16,7 @@
 package com.google.android.apps.mytracks.content;
 
 import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.util.ApiFeatures;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -371,8 +372,11 @@ public class MyTracksProvider extends ContentProvider {
       throw new IllegalArgumentException("Unknown URL " + url);
     }
 
-    Log.i(MyTracksConstants.TAG,
+    if (ApiFeatures.getInstance().canReuseSQLiteQueryBuilder()) {
-        "Build query: " + qb.buildQuery(projection, selection, selectionArgs, null, null, sortOrder, null));
+      Log.i(MyTracksConstants.TAG,
+          "Build query: " + qb.buildQuery(projection, selection, selectionArgs, 
+          null, null, sortOrder, null));
+    }
     Cursor c = qb.query(db, projection, selection, selectionArgs, null, null,
         sortOrder);
     c.setNotificationUri(getContext().getContentResolver(), url);

MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java

@@ -210,9 +210,10 @@ public class GDataWrapper<C> {
       errorType = ERROR_AUTH;
       errorMessage = e.getMessage();
     } catch (HttpException e) {
-      Log.e(MyTracksConstants.TAG, "HttpException, code " + e.getStatusCode(), e);
+      Log.e(MyTracksConstants.TAG, 
+          "HttpException, code " + e.getStatusCode() + " message " + e.getMessage(), e);
       errorMessage = e.getMessage();
-      if (errorMessage != null && errorMessage.contains("401")) {
+      if (e.getStatusCode() == 401) {
         errorType = ERROR_AUTH;
       } else {
         errorType = ERROR_CONNECTION;

MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java

@@ -107,6 +107,18 @@ public class ApiFeatures {
     return getApiLevel() >= 9;
   }
   
+  /**
+   * There's a bug (#1587) in Cupcake and Donut which prevents you from
+   * using a SQLiteQueryBuilder twice.  That is, if you call buildQuery
+   * on a given instance (to log the statement for debugging), and then
+   * call query on the same instance to make it actually do the query,
+   * it'll regenerate the query for the second call, and will screw it
+   * up.  Specifically, it'll add extra parens which don't belong.
+   */
+  public boolean canReuseSQLiteQueryBuilder() {
+    return getApiLevel() > 4;
+  }
+
   // Visible for testing.
   protected int getApiLevel() {
     return ANDROID_API_LEVEL;