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

Commit 47c939f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support to trigger bugreport when iwlan/qualified network service crash"

parents 9482f918 7b650b32

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

+8 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.Annotation.ApnType;

import android.telephony.AnomalyReporter;

import android.telephony.CarrierConfigManager;

import android.telephony.data.ApnSetting;

import android.telephony.data.ApnThrottleStatus;
@@ -52,6 +53,7 @@ import java.util.Arrays; 
import java.util.HashSet;

import java.util.List;

import java.util.Set;

import java.util.UUID;

import java.util.stream.Collectors;



/**
@@ -62,6 +64,8 @@ import java.util.stream.Collectors; 
public class AccessNetworksManager extends Handler {

    private static final String TAG = AccessNetworksManager.class.getSimpleName();

    private static final boolean DBG = false;

    private final UUID mAnomalyUUID = UUID.fromString("c2d1a639-00e2-4561-9619-6acf37d90590");

    private String mLastBoundPackageName;



    private static final int[] SUPPORTED_APN_TYPES = {

            ApnSetting.TYPE_DEFAULT,
@@ -156,7 +160,9 @@ public class AccessNetworksManager extends Handler { 
        @Override

        public void binderDied() {

            // TODO: try to rebind the service.

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

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

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

            AnomalyReporter.reportAnomaly(mAnomalyUUID, message);

        }

    }
@@ -178,6 +184,7 @@ public class AccessNetworksManager extends Handler { 
            if (DBG) log("onServiceConnected " + name);

            mIQualifiedNetworksService = IQualifiedNetworksService.Stub.asInterface(service);

            mDeathRecipient = new AccessNetworksManagerDeathRecipient();

            mLastBoundPackageName = getQualifiedNetworksServicePackageName();



            try {

                service.linkToDeath(mDeathRecipient, 0 /* flags */);

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

+7 −1
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ public class DataServiceManager extends Handler { 


    private CellularDataServiceConnection mServiceConnection;



    private final UUID mAnomalyUUID = UUID.fromString("fc1956de-c080-45de-8431-a1faab687110");

    private String mLastBoundPackageName;



    /**

     * Helpful for logging

     * @return the tag name
@@ -142,8 +145,10 @@ public class DataServiceManager extends Handler { 
        @Override

        public void binderDied() {

            // TODO: try to rebind the service.

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

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

                    + " died.");

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

            AnomalyReporter.reportAnomaly(mAnomalyUUID, message);

        }

    }
@@ -215,6 +220,7 @@ public class DataServiceManager extends Handler { 
            mIDataService = IDataService.Stub.asInterface(service);

            mDeathRecipient = new DataServiceManagerDeathRecipient();

            mBound = true;

            mLastBoundPackageName = getDataServicePackageName();



            try {

                service.linkToDeath(mDeathRecipient, 0);