Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a4cdcaf authored by Nathan Harold's avatar Nathan Harold Committed by Android Git Automerger
Browse files

am ffbf7549: Merge "Disable DataConnection RealTimeInfo" into mnc-dev 

* commit 'ffbf7549':
  Disable DataConnection RealTimeInfo
parents b5b7abaf ffbf7549

src/java/com/android/internal/telephony/dataconnection/DcController.java

+22 −22
Original line number Diff line number Diff line
@@ -379,28 +379,28 @@ class DcController extends StateMachine { 
                }

            }



            // Temporary notification until RIL implementation is complete.

            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);

            }

            // 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