commit 3a860a3fda3d74777887e507bdddfca1c4369e6c
author Santos Cordon <santoscordon@google.com> Fri Apr 24 00:06:49 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 24 00:07:02 2015 +0000
tree 7bd65d536c812f29e8dad0a2088b482774d8d7bb
parent 3b0a1681da446c468587974fd5f2398c25332479
parent 0f68464f84adfc401dd7eba9ee4b0a3799d17673

Merge "update PRE_DIAL_WAIT in old system API"

api/23.txt

diff --git a/api/23.txt b/api/23.txt
index 9326cfd..b658463 100644
--- a/api/23.txt
+++ b/api/23.txt
@@ -16899,11 +16899,8 @@
     method public void reportBadNetwork(android.net.Network);
     method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
     method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
-    method public deprecated boolean requestRouteToHost(int, int);
     method public deprecated void setNetworkPreference(int);
     method public static boolean setProcessDefaultNetwork(android.net.Network);
-    method public deprecated int startUsingNetworkFeature(int, java.lang.String);
-    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
     method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
     field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
     field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";

system-api/23.txt

diff --git a/system-api/23.txt b/system-api/23.txt
index 20f203c..cfceba5 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -18150,11 +18150,8 @@
     method public void reportBadNetwork(android.net.Network);
     method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
     method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
-    method public deprecated boolean requestRouteToHost(int, int);
     method public deprecated void setNetworkPreference(int);
     method public static boolean setProcessDefaultNetwork(android.net.Network);
-    method public deprecated int startUsingNetworkFeature(int, java.lang.String);
-    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
     method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
     field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
     field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";

tools/jack

diff --git a/tools/jack b/tools/jack
index b26baff..35591c2 100755
--- a/tools/jack
+++ b/tools/jack
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# v 1.1-a11-log
+# v 1.1-a11-log-pl2
 #
 set -o nounset
 umask 077
@@ -92,7 +92,7 @@
 touch  "$JACK_CLI" "$JACK_EXIT"
 
 # Try to cleanup if interrupted
-abort () { kill -9 $PID_OUT $PID_ERR 2>>$SERVER_LOG; wait $PID_OUT $PID_ERR 2>>$SERVER_LOG; exit 255; }
+abort () { echo $(uptime) >>$SERVER_LOG; kill -9 $PID_OUT $PID_ERR 2>>$SERVER_LOG; wait $PID_OUT $PID_ERR 2>>$SERVER_LOG; exit 255; }
 trap 'abort' SIGHUP SIGINT SIGQUIT SIGTERM ERR
 
 # Redirect output and error
@@ -115,18 +115,19 @@
 set +o errexit
 trap ERR
 
-RETRY_LAUNCH=3
+RETRY_LAUNCH=1
 RETRY_SESSION=3
-DELAY_CONNECT=3
+DELAY_CONNECT=30
 
 
 # Launch compilation
 DATE_CONNECT=$(date +%s)
 while true; do
+  CURL_TIME=$(date +%H:%M:%S)
   HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --connect-timeout 10 --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI")
   CURL_CODE=$?
   JACK_CODE=$(cat "$JACK_EXIT")
-  echo "CURL: $$ - $CURL_CODE - $HTTP_CODE - $JACK_CODE" >>$SERVER_LOG
+  echo "CURL: $$ - $CURL_TIME - $CURL_CODE - $HTTP_CODE - $JACK_CODE" >>$SERVER_LOG
   if [ $CURL_CODE -eq 0 ]; then
     # No problem, let's go
     break;