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

Commit f6921f51 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed crash in telephony when underlying data service died"

parents f7ec3f6d 195b0905

src/java/com/android/internal/telephony/NetworkRegistrationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ public class NetworkRegistrationManager extends Handler { 
        @Override

        public void binderDied() {

            // TODO: try to restart the service.

            logd("NetworkService(" + mComponentName +  " transport type "

                    + mTransportType + ") died.");

            logd("Network service " + mComponentName + " for transport type "

                    + AccessNetworkConstants.transportTypeToString(mTransportType) + " died.");

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ public class AccessNetworksManager extends Handler { 
        @Override

        public void binderDied() {

            // TODO: try to rebind the service.

            loge("QualifiedNetworksService(" + mLastBoundPackageName + ") died.");

            String message = "Qualified Network Service Crashed," + mLastBoundPackageName;

            String message = "Qualified network service " + mLastBoundPackageName + " died.";

            loge(message);

            AnomalyReporter.reportAnomaly(mAnomalyUUID, message);

        }

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -3217,7 +3217,10 @@ public class DataConnection extends StateMachine { 
     */

    public void tearDownAll(String reason, @ReleaseNetworkType int releaseType,

                            Message onCompletedMsg) {

        if (DBG) log("tearDownAll: reason=" + reason + ", releaseType=" + releaseType);

        if (DBG) {

            log("tearDownAll: reason=" + reason + ", releaseType="

                    + DcTracker.releaseTypeToString(releaseType));

        }

        sendMessage(DataConnection.EVENT_DISCONNECT_ALL,

                new DisconnectParams(null, reason, releaseType, onCompletedMsg));

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -121,9 +121,10 @@ public class DataConnectionReasons { 
        DATA_ALREADY_CONNECTED(true),   // Data is already connected. No need to setup data again.

        ON_IWLAN(true),

        IN_ECBM(true),

        ON_OTHER_TRANSPORT(true);   // When data retry occurs, the given APN type's preferred

        ON_OTHER_TRANSPORT(true),   // When data retry occurs, the given APN type's preferred

                                    // transport might be already changed. In this case we

                                    // should disallow data retry.

        DATA_SERVICE_NOT_READY(true);   // Underlying data service is not bound.



        private boolean mIsHardReason;

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

+3 −3
Original line number Diff line number Diff line
@@ -145,9 +145,9 @@ public class DataServiceManager extends Handler { 
        @Override

        public void binderDied() {

            // TODO: try to rebind the service.

            loge("DataService " + mLastBoundPackageName +  ", transport type " + mTransportType

                    + " died.");

            String message = "Iwlan Data Service Crashed," + mLastBoundPackageName;

            String message = "Data service " + mLastBoundPackageName +  " for transport type "

                    + AccessNetworkConstants.transportTypeToString(mTransportType) + " died.";

            loge(message);

            AnomalyReporter.reportAnomaly(mAnomalyUUID, message);

        }

    }