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

Commit d568a71c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Anomaly report setup data to track unspecified failure" into tm-qpr-dev... 

Merge "Anomaly report setup data to track unspecified failure" into tm-qpr-dev am: 58f10822 am: 567df963

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/19888467



Change-Id: Ib09c6a7e4e4a9eb9d6c6b2d1efe406cc76a85d28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 853f59ae 567df963

src/java/com/android/internal/telephony/data/DataNetworkController.java

+12 −2
Original line number Diff line number Diff line
@@ -2512,7 +2512,7 @@ public class DataNetworkController extends Handler { 
        logl("onDataNetworkSetupDataFailed: " + dataNetwork + ", cause="

                + DataFailCause.toString(cause) + ", retryDelayMillis=" + retryDelayMillis + "ms.");

        mDataNetworkList.remove(dataNetwork);

        trackSetupDataCallFailure(dataNetwork.getTransport());

        trackSetupDataCallFailure(dataNetwork.getTransport(), cause);

        if (mAnyDataNetworkExisting && mDataNetworkList.isEmpty()) {

            mPendingTearDownAllNetworks = false;

            mAnyDataNetworkExisting = false;
@@ -2537,8 +2537,10 @@ public class DataNetworkController extends Handler { 
     * {@link AccessNetworkConstants.TransportType} data service.

     *

     * @param transport The transport of the data service.

     * @param cause The fail cause

     */

    private void trackSetupDataCallFailure(@TransportType int transport) {

    private void trackSetupDataCallFailure(@TransportType int transport,

            @DataFailureCause int cause) {

        switch (transport) {

            case AccessNetworkConstants.TRANSPORT_TYPE_WWAN:

                // Skip when poor signal strength
@@ -2546,6 +2548,10 @@ public class DataNetworkController extends Handler { 
                        <= CellSignalStrength.SIGNAL_STRENGTH_POOR) {

                    return;

                }

                if (cause == DataFailCause.ERROR_UNSPECIFIED || cause == DataFailCause.UNKNOWN) {

                    reportAnomaly("RIL set up data call fails: unknown/unspecified error",

                            "ce7d1465-d8e4-404a-b76f-de2c60bee843");

                }

                if (mSetupDataCallWwanFailureCounter.addOccurrence()) {

                    reportAnomaly("RIL fails setup data call request "

                                    + mSetupDataCallWwanFailureCounter.getFrequencyString(),
@@ -2553,6 +2559,10 @@ public class DataNetworkController extends Handler { 
                }

                break;

            case AccessNetworkConstants.TRANSPORT_TYPE_WLAN:

                if (cause == DataFailCause.ERROR_UNSPECIFIED || cause == DataFailCause.UNKNOWN) {

                    reportAnomaly("IWLAN set up data call fails: unknown/unspecified error",

                            "a16fc15c-815b-4908-b8e6-5f3bc7cbc20b");

                }

                if (mSetupDataCallWlanFailureCounter.addOccurrence()) {

                    reportAnomaly("IWLAN data service fails setup data call request "

                                    + mSetupDataCallWlanFailureCounter.getFrequencyString(),