From 1ab65e54eaa799ac6dfc927274c03818cd7c20bb Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Fri, 12 Mar 2021 10:02:08 -0800 Subject: [PATCH] Fix CDM profiles string template use String template was recently updated. This updates the values to be placed into it. Bug: 165951651 Test: manual Change-Id: Ib3d2b4a08df2ad7422a28eb5ff9379d92e78343a --- .../companiondevicemanager/CompanionDeviceActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index f1a98adc0ab28..91a6749ac42d0 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -128,9 +128,11 @@ public class CompanionDeviceActivity extends Activity { if (useDeviceProfile) { profileSummary.setVisibility(View.VISIBLE); + String deviceRef = getRequest().isSingleDevice() + ? getService().mDevicesFound.get(0).getDisplayName() + : profileName; profileSummary.setText(getString(R.string.profile_summary, - getCallingAppName(), - profileName, + deviceRef, profilePrivacyDisclaimer)); } else { profileSummary.setVisibility(View.GONE);