commit f3be06368835697b50859db0ee8401089de3069a
author Malcolm Chen <refuhoo@google.com> Mon Feb 05 23:26:50 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 05 23:26:50 2018 +0000
tree 1110652e6b01e92062664e637fa485212cd3f072
parent 9b511ba02b824fac3ac6c23342ece02a32e3aef6
parent a402e89c7dcbc612b2aa8176ec0b997f7946c3e0

Remove DATA_ENABLED_PROP system property.
am: a402e89c7d

Change-Id: I569e0784a009546253c18cb17db530bd92ff0cf7

src/java/com/android/ims/ImsManager.java

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 62f4fc6..ad8d11b 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -194,10 +194,6 @@
     private Set<MmTelFeatureConnection.IFeatureUpdate> mStatusCallbacks =
             new CopyOnWriteArraySet<>();
 
-    // Flag indicating data enabled or not. This flag should be in sync with
-    // DcTracker.isDataEnabled(). The flag will be set later during boot up.
-    private static final String DATA_ENABLED_PROP = "net.lte.ims.data.enabled";
-
     public static final String TRUE = "true";
     public static final String FALSE = "false";
 
@@ -2094,16 +2090,7 @@
     }
 
     private boolean isDataEnabled() {
-        return SystemProperties.getBoolean(DATA_ENABLED_PROP, true);
-    }
-
-    /**
-     * Set data enabled/disabled flag.
-     * @param enabled True if data is enabled, otherwise disabled.
-     */
-    public void setDataEnabled(boolean enabled) {
-        log("setDataEnabled: " + enabled);
-        SystemProperties.set(DATA_ENABLED_PROP, enabled ? TRUE : FALSE);
+        return new TelephonyManager(mContext, getSubId()).isMobileDataEnabled();
     }
 
     private boolean isVolteProvisioned() {