From 872ffb60ddbd3f216110a5842d2781c1531621aa Mon Sep 17 00:00:00 2001 From: Claudiu Ghioc Date: Fri, 16 Dec 2022 10:35:05 +0000 Subject: [PATCH] [CDM] Include "notifications" in the "glasses" CDM profile Bug: 262500542 Test: atest CtsCompanionDeviceManagerCoreTestCases Test: atest CtsCompanionDeviceManagerNoCompanionServicesTestCases Test: atest CtsCompanionDeviceManagerUiAutomationTestCases Change-Id: I5879ac6c2580406c2b00982e6efc80cd14e78da5 Signed-off-by: Claudiu Ghioc --- packages/CompanionDeviceManager/res/values/strings.xml | 2 +- .../companiondevicemanager/CompanionDeviceActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index 3b215415a460d..0764d9032c1b8 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -43,7 +43,7 @@ glasses - This app is needed to manage your %1$s. %2$s will be allowed to access your Phone, SMS, Contacts, Microphone and Nearby devices permissions. + This app is needed to manage your %1$s. %2$s will be allowed to interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions. The app is needed to manage your %1$s. %2$s will be allowed to interact with these permissions: diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index 49a6334506294..8d0a2c04ee2b3 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -592,13 +592,13 @@ public class CompanionDeviceActivity extends FragmentActivity implements setupPermissionList(); } else if (deviceProfile.equals(DEVICE_PROFILE_GLASSES)) { profileName = getString(R.string.profile_name_glasses); - title = getHtmlFromResources(this, R.string.confirmation_title, appLabel, profileName); + title = getHtmlFromResources(this, R.string.confirmation_title, appLabel, deviceName); summary = getHtmlFromResources( this, R.string.summary_glasses_single_device, profileName, appLabel); profileIcon = getIcon(this, R.drawable.ic_glasses); mPermissionTypes.addAll(Arrays.asList( - PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS, + PERMISSION_NOTIFICATION, PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS, PERMISSION_MICROPHONE, PERMISSION_NEARBY_DEVICES)); setupPermissionList();