commit fc57843ecd4eae238d193c9c3e68c0176c17d99d
author Wink Saville <wink@google.com> Mon Sep 30 10:48:17 2013 -0700
committer Wink Saville <wink@google.com> Mon Sep 30 10:48:17 2013 -0700
tree fcf7a867609bbbe9a76dc74c1788cee9842274d7
parent c02f79dceeaf3afe249e819106ee1c6074e031ca

Do not bounce radio and add one retry

Bug: 11005448
Change-Id: I1d4dcb169460413bc7278bbd98656beea9731b69

src/com/android/phone/HfaLogic.java

diff --git a/src/com/android/phone/HfaLogic.java b/src/com/android/phone/HfaLogic.java
index 5a5e4b4..e4a3205 100644
--- a/src/com/android/phone/HfaLogic.java
+++ b/src/com/android/phone/HfaLogic.java
@@ -71,6 +71,9 @@
     private PendingIntent mResponseIntent;
     private Context mContext;
 
+    private static final int DEFAULT_RETRY_COUNT = 1;
+    private int mRetryCount;
+
     public interface HfaLogicCallback {
         public void onSuccess();
         public void onError(String errorMsg);
@@ -83,34 +86,47 @@
     }
 
     public void start() {
-        Log.i(TAG, "Start Hfa Provisioning.");
+        Log.i(TAG, "start:");
+        mRetryCount = DEFAULT_RETRY_COUNT;
         startHfaIntentReceiver();
         startProvisioning();
     }
 
     private void startProvisioning() {
+        Log.i(TAG, "startProvisioning:");
         sendHfaCommand(ACTION_START);
     }
 
     private void sendHfaCommand(String action) {
-        Log.i(TAG, "Sending command: " + action);
+        Log.i(TAG, "sendHfaCommand: command=" + action);
         mContext.sendBroadcast(new Intent(action));
     }
 
     private void onHfaError(String errorMsg) {
-        Log.i(TAG, "HfaError");
-        stopHfaIntentReceiver();
-        sendFinalResponse(OTASP_FAILURE, errorMsg);
-        mCallback.onError(errorMsg);
+        Log.i(TAG, "onHfaError: call mCallBack.onError errorMsg=" + errorMsg
+                + " mRetryCount=" + mRetryCount);
+        mRetryCount -= 1;
+        if (mRetryCount >= 0) {
+            Log.i(TAG, "onHfaError: retry");
+            startProvisioning();
+        } else {
+            Log.i(TAG, "onHfaError: Declare OTASP_FAILURE");
+            mRetryCount = 0;
+            stopHfaIntentReceiver();
+            sendFinalResponse(OTASP_FAILURE, errorMsg);
+            mCallback.onError(errorMsg);
+        }
     }
 
     private void onHfaSuccess() {
-        Log.i(TAG, "HfaSuccess");
+        Log.i(TAG, "onHfaSuccess: NOT bouncing radio call onTotalSuccess");
         stopHfaIntentReceiver();
-        bounceRadio();
+        // bounceRadio();
+        onTotalSuccess();
     }
 
     private void onTotalSuccess() {
+        Log.i(TAG, "onTotalSuccess: call mCallBack.onSuccess");
         sendFinalResponse(OTASP_SUCCESS, null);
         mCallback.onSuccess();
     }