diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 18 | 
2 files changed, 27 insertions, 1 deletions
| diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8da91ee4228f..fb451ddabd04 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3327,7 +3327,9 @@           <p>Protection level: normal           -->      <permission android:name="android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND" -        android:protectionLevel="normal"/> +                android:label="@string/permlab_startForegroundServicesFromBackground" +                android:description="@string/permdesc_startForegroundServicesFromBackground" +                android:protectionLevel="normal"/>      <!-- Allows a companion app to use data in the background.           <p>Protection level: normal @@ -3343,6 +3345,8 @@           <p>Protection level: normal       -->      <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" +                android:label="@string/permlab_companionProfileWatch" +                android:description="@string/permdesc_companionProfileWatch"                  android:protectionLevel="normal" />      <!-- Allows application to request to be associated with a virtual display capable of streaming @@ -4914,11 +4918,15 @@           of their associated companion device           -->      <permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE" +                android:label="@string/permlab_observeCompanionDevicePresence" +                android:description="@string/permdesc_observeCompanionDevicePresence"                  android:protectionLevel="normal" />      <!-- Allows an application to deliver companion messages to system           -->      <permission android:name="android.permission.DELIVER_COMPANION_MESSAGES" +                android:label="@string/permlab_deliverCompanionMessages" +                android:description="@string/permdesc_deliverCompanionMessages"                  android:protectionLevel="normal" />      <!-- Allows an application to create new companion device associations. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 6aea32f0217e..39012ae20e0a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -6407,4 +6407,22 @@ ul.</string>      <!-- Display content to tell the user the sim card name and number-->      <string name="default_card_name">CARD <xliff:g id="cardNumber" example="1">%d</xliff:g></string> + +    <!-- Strings for CompanionDeviceManager --> +    <!-- Title of Watch profile permission, which allows a companion app to manage watches. [CHAR LIMIT=NONE] --> +    <string name="permlab_companionProfileWatch">Companion Watch profile permission to manage watches</string> +    <!-- Description of Watch profile permission, which allows a companion app to manage watches. [CHAR LIMIT=NONE] --> +    <string name="permdesc_companionProfileWatch">Allows a companion app to manage watches.</string> +    <!-- Title of observing device presence permission, which allows a companion app to observe the presence of the associated devices. [CHAR LIMIT=NONE] --> +    <string name="permlab_observeCompanionDevicePresence">Observe companion device presence</string> +    <!-- Description of observing device presence permission, which allows a companion app to observe the presence of the associated devices. [CHAR LIMIT=NONE] --> +    <string name="permdesc_observeCompanionDevicePresence">Allows a companion app to observe companion device presence when the devices are nearby or far-away.</string> +    <!-- Title of delivering companion messages permission, which allows a companion app to deliver messages to other devices. [CHAR LIMIT=NONE] --> +    <string name="permlab_deliverCompanionMessages">Deliver companion messages</string> +    <!-- Description of delivering companion messages permission, which allows a companion app to deliver messages to other devices. [CHAR LIMIT=NONE] --> +    <string name="permdesc_deliverCompanionMessages">Allows a companion app to deliver companion messages to other devices.</string> +    <!-- Title of start foreground services from background permission [CHAR LIMIT=NONE] --> +    <string name="permlab_startForegroundServicesFromBackground">Start foreground services from background</string> +    <!-- Description of start foreground services from background permission [CHAR LIMIT=NONE] --> +    <string name="permdesc_startForegroundServicesFromBackground">Allows a companion app to start foreground services from background.</string>  </resources> |