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

Commit 2bb91c8c authored by Pranav Madapurmath's avatar Pranav Madapurmath
Browse files

Rename EmergencyCallDiagnosticParam API 

For naming consistency between the class and method, rename
EmergencyCallDiagnosticParam to EmergencyCallDiagnosticData. This
feedback was given from API review.

Bug: 322979365
Bug: 311773409
Test: atest TelephonyManagerTest
Change-Id: Ibf4ea73f25dc3af0c781d2af6271aa71f23c8327
parent ac635e24

src/com/android/server/telecom/EmergencyCallDiagnosticLogger.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package com.android.server.telecom;

package com.android.server.telecom;





import static android.telephony.TelephonyManager.EmergencyCallDiagnosticParams;

import static android.telephony.TelephonyManager.EmergencyCallDiagnosticData;





import android.os.BugreportManager;

import android.os.BugreportManager;

import android.os.DropBoxManager;

import android.os.DropBoxManager;
@@ -156,19 +156,19 @@ public class EmergencyCallDiagnosticLogger extends CallsManagerListenerBase 
        List<Integer> dataCollectionTypes = getDataCollectionTypes(reason);

        List<Integer> dataCollectionTypes = getDataCollectionTypes(reason);

        boolean invokeTelephonyPersistApi = false;

        boolean invokeTelephonyPersistApi = false;

        CallEventTimestamps ts = mEmergencyCallsMap.get(call);

        CallEventTimestamps ts = mEmergencyCallsMap.get(call);

        EmergencyCallDiagnosticParams.Builder callDiagnosticBuilder =

        EmergencyCallDiagnosticData.Builder callDiagnosticBuilder =

                new EmergencyCallDiagnosticParams.Builder();

                new EmergencyCallDiagnosticData.Builder();

        for (Integer dataCollectionType : dataCollectionTypes) {

        for (Integer dataCollectionType : dataCollectionTypes) {

            switch (dataCollectionType) {

            switch (dataCollectionType) {

                case COLLECTION_TYPE_TELECOM_STATE:

                case COLLECTION_TYPE_TELECOM_STATE:

                    if (isTelecomDumpCollectionEnabled()) {

                    if (isTelecomDumpCollectionEnabled()) {

                        callDiagnosticBuilder.setTelecomDumpSysCollectionEnabled(true);

                        callDiagnosticBuilder.setTelecomDumpsysCollectionEnabled(true);

                        invokeTelephonyPersistApi = true;

                        invokeTelephonyPersistApi = true;

                    }

                    }

                    break;

                    break;

                case COLLECTION_TYPE_TELEPHONY_STATE:

                case COLLECTION_TYPE_TELEPHONY_STATE:

                    if (isTelephonyDumpCollectionEnabled()) {

                    if (isTelephonyDumpCollectionEnabled()) {

                        callDiagnosticBuilder.setTelephonyDumpSysCollectionEnabled(true);

                        callDiagnosticBuilder.setTelephonyDumpsysCollectionEnabled(true);

                        invokeTelephonyPersistApi = true;

                        invokeTelephonyPersistApi = true;

                    }

                    }

                    break;

                    break;
@@ -192,14 +192,14 @@ public class EmergencyCallDiagnosticLogger extends CallsManagerListenerBase 
                default:

                default:

            }

            }

        }

        }

        EmergencyCallDiagnosticParams dp = callDiagnosticBuilder.build();

        EmergencyCallDiagnosticData ecdData = callDiagnosticBuilder.build();

        if (invokeTelephonyPersistApi) {

        if (invokeTelephonyPersistApi) {

            mAsyncTaskExecutor.execute(new Runnable() {

            mAsyncTaskExecutor.execute(new Runnable() {

                @Override

                @Override

                public void run() {

                public void run() {

                    Log.i(this, "Requesting Telephony to persist data %s", dp.toString());

                    Log.i(this, "Requesting Telephony to persist data %s", ecdData.toString());

                    try {

                    try {

                        mTelephonyManager.persistEmergencyCallDiagnosticData(DROPBOX_TAG, dp);

                        mTelephonyManager.persistEmergencyCallDiagnosticData(DROPBOX_TAG, ecdData);

                    } catch (Exception e) {

                    } catch (Exception e) {

                        Log.w(this,

                        Log.w(this,

                                "Exception while invoking "

                                "Exception while invoking "

tests/src/com/android/server/telecom/tests/EmergencyCallDiagnosticLoggerTest.java

+13 −14
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.telecom.tests;

package com.android.server.telecom.tests;









import static android.telephony.TelephonyManager.EmergencyCallDiagnosticParams;

import static android.telephony.TelephonyManager.EmergencyCallDiagnosticData;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertNotEquals;
@@ -238,16 +238,16 @@ public class EmergencyCallDiagnosticLoggerTest extends TelecomTestCase { 
        mEmergencyCallDiagnosticLogger.reportStuckCall(call);

        mEmergencyCallDiagnosticLogger.reportStuckCall(call);





        //for stuck calls, we should always be persisting some data

        //for stuck calls, we should always be persisting some data

        ArgumentCaptor<EmergencyCallDiagnosticParams> captor =

        ArgumentCaptor<EmergencyCallDiagnosticData> captor =

                ArgumentCaptor.forClass(EmergencyCallDiagnosticParams.class);

                ArgumentCaptor.forClass(EmergencyCallDiagnosticData.class);

        verify(mTm, times(1)).persistEmergencyCallDiagnosticData(eq(DROP_BOX_TAG),

        verify(mTm, times(1)).persistEmergencyCallDiagnosticData(eq(DROP_BOX_TAG),

                captor.capture());

                captor.capture());

        EmergencyCallDiagnosticParams dp = captor.getValue();

        EmergencyCallDiagnosticData ecdData = captor.getValue();





        assertNotNull(dp);

        assertNotNull(ecdData);

        assertTrue(

        assertTrue(

                dp.isLogcatCollectionEnabled() || dp.isTelecomDumpSysCollectionEnabled()

                ecdData.isLogcatCollectionEnabled() || ecdData.isTelecomDumpsysCollectionEnabled()

                        || dp.isTelephonyDumpSysCollectionEnabled());

                        || ecdData.isTelephonyDumpsysCollectionEnabled());





        //tracking should end

        //tracking should end

        assertEquals(0, mEmergencyCallDiagnosticLogger.getEmergencyCallsMap().size());

        assertEquals(0, mEmergencyCallDiagnosticLogger.getEmergencyCallsMap().size());
@@ -265,17 +265,16 @@ public class EmergencyCallDiagnosticLoggerTest extends TelecomTestCase { 
        mEmergencyCallDiagnosticLogger.onCallRemoved(call);

        mEmergencyCallDiagnosticLogger.onCallRemoved(call);





        //for non-local disconnect of non-active call,  we should always be persisting some data

        //for non-local disconnect of non-active call,  we should always be persisting some data

        ArgumentCaptor<TelephonyManager.EmergencyCallDiagnosticParams> captor =

        ArgumentCaptor<EmergencyCallDiagnosticData> captor =

                ArgumentCaptor.forClass(

                ArgumentCaptor.forClass(EmergencyCallDiagnosticData.class);

                        TelephonyManager.EmergencyCallDiagnosticParams.class);

        verify(mTm, times(1)).persistEmergencyCallDiagnosticData(eq(DROP_BOX_TAG),

        verify(mTm, times(1)).persistEmergencyCallDiagnosticData(eq(DROP_BOX_TAG),

                captor.capture());

                captor.capture());

        TelephonyManager.EmergencyCallDiagnosticParams dp = captor.getValue();

        EmergencyCallDiagnosticData ecdData = captor.getValue();





        assertNotNull(dp);

        assertNotNull(ecdData);

        assertTrue(

        assertTrue(

                dp.isLogcatCollectionEnabled() || dp.isTelecomDumpSysCollectionEnabled()

                ecdData.isLogcatCollectionEnabled() || ecdData.isTelecomDumpsysCollectionEnabled()

                        || dp.isTelephonyDumpSysCollectionEnabled());

                        || ecdData.isTelephonyDumpsysCollectionEnabled());





        //tracking should end

        //tracking should end

        assertEquals(0, mEmergencyCallDiagnosticLogger.getEmergencyCallsMap().size());

        assertEquals(0, mEmergencyCallDiagnosticLogger.getEmergencyCallsMap().size());