Merge "Fix CDM profiles string template use" into sc-dev

2021-03-16 18:05:43 +00:00
parent 1347c35b73 1ab65e54ea
commit e1cad1e035
1 changed files with 4 additions and 2 deletions
--- 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);