commit e40f48c766942e97adf04bc1100266c8b3efa5b4
author Junyeong Bak <junyeong.bak@samsung.com> Mon Jul 31 14:42:52 2023 +0900
committer Junyeong Bak <junyeong.bak@samsung.com> Fri Oct 13 00:36:32 2023 +0000
tree 09a0cc398245ad0e7363f1168a560b40bc3fd134
parent 7d98325984eba4440d4fbccaa53f5e3ffc67f44b

Modified to display valid value set in Role when capturing log dump

Though the value is set in Role, it only has been displayed when there is overrided value for test.
So now, the value set in Role is displayed regardless of override when capturing log dump.

Test: Capture log dump
Bug: 293817231

Change-Id: Ia071e78c6245f3a712fe8142d666e955803fcc49
Signed-off-by: Junyeong Bak <junyeong.bak@samsung.com>

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

diff --git a/src/com/android/server/telecom/RoleManagerAdapterImpl.java b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
index ac35b3d..e8f5604 100644
--- a/src/com/android/server/telecom/RoleManagerAdapterImpl.java
+++ b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
@@ -185,8 +185,8 @@
             pw.print("(override ");
             pw.print(mOverrideDefaultCallRedirectionApp);
             pw.print(") ");
-            pw.print(getRoleManagerCallRedirectionApp(Binder.getCallingUserHandle()));
         }
+        pw.print(getRoleManagerCallRedirectionApp(Binder.getCallingUserHandle()));
         pw.println();
 
         pw.print("DefaultCallScreeningApp: ");
@@ -194,19 +194,19 @@
             pw.print("(override ");
             pw.print(mOverrideDefaultCallScreeningApp);
             pw.print(") ");
-            pw.print(getRoleManagerCallScreeningApp(Binder.getCallingUserHandle()));
         }
+        pw.print(getRoleManagerCallScreeningApp(Binder.getCallingUserHandle()));
         pw.println();
 
         pw.print("DefaultCallCompanionApps: ");
-        if (mOverrideCallCompanionApps != null) {
+        if (!mOverrideCallCompanionApps.isEmpty()) {
             pw.print("(override ");
             pw.print(mOverrideCallCompanionApps.stream().collect(Collectors.joining(", ")));
             pw.print(") ");
-            List<String> appsInRole = getRoleManagerCallCompanionApps();
-            if (appsInRole != null) {
-                pw.print(appsInRole.stream().collect(Collectors.joining(", ")));
-            }
+        }
+        List<String> appsInRole = getRoleManagerCallCompanionApps();
+        if (!appsInRole.isEmpty()) {
+            pw.print(appsInRole.stream().collect(Collectors.joining(", ")));
         }
         pw.println();
     }