aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2019-01-24 13:24:27 -0800
committerBrad Ebinger <breadley@google.com>2019-01-24 13:25:47 -0800
commit72d7bcb80b65a98a3bf5cad5804a19a5eff83516 (patch)
tree95b59ff9c7182feb85408d04991256281f6bbe7a
parentcc931ab82e7ec8101ea2b103c641afb64a3fd099 (diff)
downloadims-72d7bcb80b65a98a3bf5cad5804a19a5eff83516.tar.gz
Fix pi-dev-plus-aosp breakage
pi-dev-plus-aosp depends on internal ImsManager API that was removed. Re-add to get rid of build error. Test: Manual Change-Id: I99d82fdac7e7f3b8204df42299481cdee6f40163
-rw-r--r--src/java/com/android/ims/ImsManager.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index a5d437ed..1bc95f0e 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -918,6 +918,17 @@ public class ImsManager {
}
/**
+ * @deprecated Does not take into account roaming state of the network, use
+ * {@link #setWfcNonPersistent(boolean, int, boolean)}.
+ */
+ public void setWfcNonPersistent(boolean enabled, int wfcMode) {
+ TelephonyManager tm = (TelephonyManager)
+ mContext.getSystemService(Context.TELEPHONY_SERVICE);
+ boolean isRoaming = tm.isNetworkRoaming(getSubId());
+ setWfcNonPersistent(enabled, wfcMode, isRoaming);
+ }
+
+ /**
* Non-persistently change WFC enabled setting and WFC mode for slot
*
* @param wfcMode The WFC preference if WFC is enabled
@@ -994,11 +1005,9 @@ public class ImsManager {
/**
* Change persistent WFC preference setting for slot when not roaming.
- * @deprecated Use {@link #setWfcMode(int, int) instead}.
+ * @deprecated Use {@link #setWfcMode(int, boolean)} instead.
*/
public void setWfcMode(int wfcMode) {
- TelephonyManager tm = (TelephonyManager)
- mContext.getSystemService(Context.TELEPHONY_SERVICE);
setWfcMode(wfcMode, false /*isRoaming*/);
}