From c65fcced21bae913c77376e49bd666fe28e6865a Mon Sep 17 00:00:00 2001
From: "burke.davey" <burke.davey@dad15e60-07c4-0504-eb71-dc8a1c21358d>
Date: Sun, 24 Oct 2010 19:26:30 +0000
Subject: [PATCH] Update SDK. Turn on experiment.

---
 appengine/.classpath                                          | 2 +-
 appengine/.settings/com.google.appengine.eclipse.core.prefs   | 4 ++--
 .../google/android/chrometophone/server/RegisterServlet.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/appengine/.classpath b/appengine/.classpath
index 1560c35..042177c 100644
--- a/appengine/.classpath
+++ b/appengine/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="c2dm"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine (2)"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/appengine/.settings/com.google.appengine.eclipse.core.prefs b/appengine/.settings/com.google.appengine.eclipse.core.prefs
index 378d880..4f7e88c 100644
--- a/appengine/.settings/com.google.appengine.eclipse.core.prefs
+++ b/appengine/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,4 +1,4 @@
-#Sun Aug 29 18:14:05 BST 2010
+#Sun Oct 24 20:19:26 BST 2010
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.3.6.jar|appengine-api-labs-1.3.6.jar|appengine-jsr107cache-1.3.6.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.7.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.3.8.jar|appengine-api-labs-1.3.8.jar|appengine-jsr107cache-1.3.8.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.7.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
 ormEnhancementInclusions=src/**|c2dm/**
diff --git a/appengine/src/com/google/android/chrometophone/server/RegisterServlet.java b/appengine/src/com/google/android/chrometophone/server/RegisterServlet.java
index f796234..1bd6872 100644
--- a/appengine/src/com/google/android/chrometophone/server/RegisterServlet.java
+++ b/appengine/src/com/google/android/chrometophone/server/RegisterServlet.java
@@ -17,7 +17,6 @@
 package com.google.android.chrometophone.server;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
@@ -168,7 +167,8 @@ public class RegisterServlet extends HttpServlet {
                 pm.makePersistent(device);
 
                 if (device.getType().equals(DeviceInfo.TYPE_CHROME)) {
-                    if (device.getPhoneToChromeExperimentEnabled()) {
+                    // if (device.getPhoneToChromeExperimentEnabled()) {
+                    if (true) {
                         String channelId =
                             ChannelServiceFactory.getChannelService().createChannel(deviceRegistrationId);
                         resp.getWriter().println(OK_STATUS + " " + channelId);