Merge "Modified to display valid value set in Role when capturing log dump" into main (6e0f9fb0) · Commits · e / os / android_packages_services_Telecomm

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -204,8 +204,8 @@ public class RoleManagerAdapterImpl implements RoleManagerAdapter {
		pw.print("(override ");
		pw.print(mOverrideDefaultCallRedirectionApp);
		pw.print(") ");
		pw.print(getRoleManagerCallRedirectionApp(Binder.getCallingUserHandle()));
		}
		pw.print(getRoleManagerCallRedirectionApp(Binder.getCallingUserHandle()));
		pw.println();

		pw.print("DefaultCallScreeningApp: ");
		@@ -213,20 +213,20 @@ public class RoleManagerAdapterImpl implements RoleManagerAdapter {
		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) {
		if (!appsInRole.isEmpty()) {
		pw.print(appsInRole.stream().collect(Collectors.joining(", ")));
		}
		}
		pw.println();
		}
		}