Remove Data RealTime Info Listener Support

-Remove Notifier functions from PhoneNotifier, and Phone
-Remove synthesis of the RealTime Info signal from DcController

Because of intractable problems with power consumption and
consistency, this signal is removed and should not be used.

Bug: 23319188

Change-Id: I63df8909ec9c328fa7d0ed89384806362f54744a

4 files changed, 1 insertions, 51 deletions

diff --git a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
index 8c31dafdc..9ed9dc422 100644
--- a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
+++ b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.telephony.CellInfo;
-import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.Rlog;
 import android.telephony.VoLteServiceState;
 import android.telephony.ServiceState;
@@ -235,16 +234,6 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
     }
 
     @Override
-    public void notifyDataConnectionRealTimeInfo(Phone sender,
-                                                 DataConnectionRealTimeInfo dcRtInfo) {
-        try {
-            mRegistry.notifyDataConnectionRealTimeInfo(dcRtInfo);
-        } catch (RemoteException ex) {
-
-        }
-    }
-
-    @Override
     public void notifyOtaspChanged(Phone sender, int otaspMode) {
         // FIXME: subId?
         try {
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index 34fabb6b7..362459452 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -1997,10 +1997,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
         mNotifier.notifyCellInfo(this, privatizeCellInfoList(cellInfo));
     }
 
-    public void notifyDataConnectionRealTimeInfo(DataConnectionRealTimeInfo dcRtInfo) {
-        mNotifier.notifyDataConnectionRealTimeInfo(this, dcRtInfo);
-    }
-
     public void notifyVoLteServiceStateChanged(VoLteServiceState lteState) {
         mNotifier.notifyVoLteServiceStateChanged(this, lteState);
     }
@@ -3230,4 +3226,4 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
         pw.flush();
         pw.println("++++++++++++++++++++++++++++++++");
     }
-}
\ No newline at end of file
+}
diff --git a/src/java/com/android/internal/telephony/PhoneNotifier.java b/src/java/com/android/internal/telephony/PhoneNotifier.java
index ce5f4f6b4..02f15d914 100644
--- a/src/java/com/android/internal/telephony/PhoneNotifier.java
+++ b/src/java/com/android/internal/telephony/PhoneNotifier.java
@@ -17,7 +17,6 @@
 package com.android.internal.telephony;
 
 import android.telephony.CellInfo;
-import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.VoLteServiceState;
 
 import java.util.List;
@@ -58,8 +57,6 @@ public interface PhoneNotifier {
     public void notifyPreciseDataConnectionFailed(Phone sender, String reason, String apnType,
             String apn, String failCause);
 
-    public void notifyDataConnectionRealTimeInfo(Phone sender, DataConnectionRealTimeInfo dcRtInfo);
-
     public void notifyVoLteServiceStateChanged(Phone sender, VoLteServiceState lteState);
 
     public void notifyOemHookRawEventForSubscriber(int subId, byte[] rawData);
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcController.java b/src/java/com/android/internal/telephony/dataconnection/DcController.java
index d145409c8..a484230fa 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcController.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcController.java
@@ -69,9 +69,6 @@ class DcController extends StateMachine {
     static final int DATA_CONNECTION_ACTIVE_PH_LINK_UP = 2;
     static final int DATA_CONNECTION_ACTIVE_UNKNOWN = Integer.MAX_VALUE;
 
-    // One of the DATA_CONNECTION_ACTIVE_XXX values
-    int mOverallDataConnectionActiveState = DATA_CONNECTION_ACTIVE_UNKNOWN;
-
     private DccDefaultState mDccDefaultState = new DccDefaultState();
 
     TelephonyManager mTelephonyManager;
@@ -358,8 +355,6 @@ class DcController extends StateMachine {
                 }
             }
 
-            int newOverallDataConnectionActiveState = mOverallDataConnectionActiveState;
-
             if (isAnyDataCallDormant && !isAnyDataCallActive) {
                 // There is no way to indicate link activity per APN right now. So
                 // Link Activity will be considered dormant only when all data calls
@@ -370,7 +365,6 @@ class DcController extends StateMachine {
                     log("onDataStateChanged: Data Activity updated to DORMANT. stopNetStatePoll");
                 }
                 mDct.sendStopNetStatPoll(DctConstants.Activity.DORMANT);
-                newOverallDataConnectionActiveState = DATA_CONNECTION_ACTIVE_PH_LINK_DORMANT;
             } else {
                 if (DBG) {
                     log("onDataStateChanged: Data Activity updated to NONE. " +
@@ -378,36 +372,10 @@ class DcController extends StateMachine {
                             " isAnyDataCallDormant = " + isAnyDataCallDormant);
                 }
                 if (isAnyDataCallActive) {
-                    newOverallDataConnectionActiveState = DATA_CONNECTION_ACTIVE_PH_LINK_UP;
                     mDct.sendStartNetStatPoll(DctConstants.Activity.NONE);
-                } else {
-                    newOverallDataConnectionActiveState = DATA_CONNECTION_ACTIVE_PH_LINK_INACTIVE;
                 }
             }
 
-            // TODO: b/23319188 Enable/Disable this based on enable/disable of dormancy indications 
-            //if (mOverallDataConnectionActiveState != newOverallDataConnectionActiveState) {
-            //    mOverallDataConnectionActiveState = newOverallDataConnectionActiveState;
-            //    long time = SystemClock.elapsedRealtimeNanos();
-            //    int dcPowerState;
-            //    switch (mOverallDataConnectionActiveState) {
-            //        case DATA_CONNECTION_ACTIVE_PH_LINK_INACTIVE:
-            //        case DATA_CONNECTION_ACTIVE_PH_LINK_DORMANT:
-            //            dcPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
-            //            break;
-            //        case DATA_CONNECTION_ACTIVE_PH_LINK_UP:
-            //            dcPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH;
-            //            break;
-            //        default:
-            //            dcPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_UNKNOWN;
-            //            break;
-            //    }
-            //    DataConnectionRealTimeInfo dcRtInfo =
-            //            new DataConnectionRealTimeInfo(time , dcPowerState);
-            //    log("onDataStateChanged: notify DcRtInfo changed dcRtInfo=" + dcRtInfo);
-            //    mPhone.notifyDataConnectionRealTimeInfo(dcRtInfo); 
-            //}
-
             if (DBG) {
                 lr("onDataStateChanged: dcsToRetry=" + dcsToRetry
                         + " apnsToCleanup=" + apnsToCleanup);