commit ea6ada74118f869263de378f88181bb0cf91e55b
author Pranav Madapurmath <pmadapurmath@google.com> Thu Feb 01 10:29:58 2024 -0800
committer Pranav Madapurmath <pmadapurmath@google.com> Thu Feb 01 10:29:58 2024 -0800
tree c11691a6e44967eec335efcee0986aa3044c77e9
parent 0b6612b2f0fb9d20788bda56e70023524e11d2e3

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: Idc8378d2e5944a052e8660e20e4945d0b5eea4bb

tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java

diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
index 8478cc3..fb7a1d2 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -6943,31 +6943,31 @@
     }
 
     @Test
-    @ApiTest(apis = {"android.telephony.TelephonyManager#EmergencyCallDiagnosticParams"})
+    @ApiTest(apis = {"android.telephony.TelephonyManager#EmergencyCallDiagnosticData"})
     @RequiresFlagsEnabled(
             com.android.server.telecom.flags.Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES)
-    public void testEmergencyCallDiagnosticParams() {
+    public void testEmergencyCallDiagnosticData() {
         long startTime = SystemClock.elapsedRealtime();
-        TelephonyManager.EmergencyCallDiagnosticParams.Builder callDiagnosticBuilder =
-                new TelephonyManager.EmergencyCallDiagnosticParams.Builder();
-        TelephonyManager.EmergencyCallDiagnosticParams params = callDiagnosticBuilder
-                .setTelecomDumpSysCollectionEnabled(true)
-                .setTelephonyDumpSysCollectionEnabled(true)
+        TelephonyManager.EmergencyCallDiagnosticData.Builder callDiagnosticBuilder =
+                new TelephonyManager.EmergencyCallDiagnosticData.Builder();
+        TelephonyManager.EmergencyCallDiagnosticData data = callDiagnosticBuilder
+                .setTelecomDumpsysCollectionEnabled(true)
+                .setTelephonyDumpsysCollectionEnabled(true)
                 .setLogcatCollectionStartTimeMillis(startTime)
                 .build();
-        assertTrue(params.isTelecomDumpSysCollectionEnabled());
-        assertTrue(params.isTelephonyDumpSysCollectionEnabled());
-        assertTrue(params.isLogcatCollectionEnabled());
-        assertEquals(startTime, params.getLogcatCollectionStartTimeMillis());
+        assertTrue(data.isTelecomDumpsysCollectionEnabled());
+        assertTrue(data.isTelephonyDumpsysCollectionEnabled());
+        assertTrue(data.isLogcatCollectionEnabled());
+        assertEquals(startTime, data.getLogcatCollectionStartTimeMillis());
 
-        params = callDiagnosticBuilder
-                .setTelecomDumpSysCollectionEnabled(false)
-                .setTelephonyDumpSysCollectionEnabled(false)
+        data = callDiagnosticBuilder
+                .setTelecomDumpsysCollectionEnabled(false)
+                .setTelephonyDumpsysCollectionEnabled(false)
                 .setLogcatCollectionStartTimeMillis(-1L)
                 .build();
-        assertFalse(params.isTelecomDumpSysCollectionEnabled());
-        assertFalse(params.isTelephonyDumpSysCollectionEnabled());
-        assertFalse(params.isLogcatCollectionEnabled());
+        assertFalse(data.isTelecomDumpsysCollectionEnabled());
+        assertFalse(data.isTelephonyDumpsysCollectionEnabled());
+        assertFalse(data.isLogcatCollectionEnabled());
     }
 
     @Test
@@ -6988,8 +6988,8 @@
             }
         }, mDropBoxIntentFilter);
 
-        TelephonyManager.EmergencyCallDiagnosticParams.Builder callDiagnosticBuilder =
-                new TelephonyManager.EmergencyCallDiagnosticParams.Builder();
+        TelephonyManager.EmergencyCallDiagnosticData.Builder callDiagnosticBuilder =
+                new TelephonyManager.EmergencyCallDiagnosticData.Builder();
         persistCallDiagnostics(callDiagnosticBuilder, true /* setTelecomDump */,
                 false /* setTelephonyDump */, false /* setLogcatDump */);
         String telecomDumpOutput = TestUtils.executeShellCommand(getInstrumentation(),
@@ -7014,19 +7014,19 @@
     }
 
     private void persistCallDiagnostics(
-            TelephonyManager.EmergencyCallDiagnosticParams.Builder callDiagnosticBuilder,
+            TelephonyManager.EmergencyCallDiagnosticData.Builder callDiagnosticBuilder,
             boolean setTelecomDump, boolean setTelephonyDump, boolean setLogcatDump)
             throws InterruptedException {
-        TelephonyManager.EmergencyCallDiagnosticParams params = callDiagnosticBuilder
-                .setTelecomDumpSysCollectionEnabled(setTelecomDump)
-                .setTelephonyDumpSysCollectionEnabled(setTelephonyDump)
+        TelephonyManager.EmergencyCallDiagnosticData data = callDiagnosticBuilder
+                .setTelecomDumpsysCollectionEnabled(setTelecomDump)
+                .setTelephonyDumpsysCollectionEnabled(setTelephonyDump)
                 .setLogcatCollectionStartTimeMillis(
                         setLogcatDump ? SystemClock.elapsedRealtime() : -1L)
                 .build();
 
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
-                    (tm) -> tm.persistEmergencyCallDiagnosticData(DROPBOX_TAG, params),
+                    (tm) -> tm.persistEmergencyCallDiagnosticData(DROPBOX_TAG, data),
                     permission.DUMP);
         } catch (SecurityException e) {
             e.printStackTrace();