From 2cde710fe42b706b368aec9b85f134f2d2452f7f Mon Sep 17 00:00:00 2001
From: Sailesh Nepal <sail@google.com>
Date: Tue, 11 Feb 2014 22:54:58 -0800
Subject: [PATCH] Update TelephonyManager.WifiCallingChoices API

This CL updates the order of the WifiCallingChoices values
to match the wifi_calling_choice_values resource.

Change-Id: Iaa643d7a70938877c760ff4a65f737a4c1c750da
---
 api/current.txt                                        | 1 +
 telephony/java/android/telephony/TelephonyManager.java | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 414169f134e19..a47267b3883d0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24512,6 +24512,7 @@ package android.telephony {
     method public java.lang.String getSubscriberId();
     method public java.lang.String getVoiceMailAlphaTag();
     method public java.lang.String getVoiceMailNumber();
+    method public int getWhenToMakeWifiCalls();
     method public boolean hasIccCard();
     method public boolean iccCloseLogicalChannel(int);
     method public int iccOpenLogicalChannel(java.lang.String);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 5902b9c17411f..ec1f1df49174a 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -70,10 +70,10 @@ public class TelephonyManager {
     public interface WifiCallingChoices {
         /** Always use Wi-Fi calling */
         static final int ALWAYS_USE = 0;
-        /** Never use Wi-Fi calling */
-        static final int NEVER_USE = 1;
         /** Ask the user whether to use Wi-Fi on every call */
-        static final int ASK_EVERY_TIME = 2;
+        static final int ASK_EVERY_TIME = 1;
+        /** Never use Wi-Fi calling */
+        static final int NEVER_USE = 2;
     }
 
     /** @hide */
@@ -1631,6 +1631,7 @@ public class TelephonyManager {
             Rlog.e(TAG, "setRadioMode NPE", ex);
         }
         return false;
+    }
 
     /*
      * Obtain the current state of Wi-Fi calling.