Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7805d8ff authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Itemize the CDM dialog for the VIRTUAL_DEVICE profile" into main

parents d6a3c6ff 4f49e1da

packages/CompanionDeviceManager/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
    <string name="title_virtual_device">Allow &lt;strong&gt;<xliff:g id="app_name" example="Exo">%1$s</xliff:g>&lt;/strong&gt; to stream audio and system features between your <xliff:g id="device_type" example="phone">%3$s</xliff:g> and &lt;strong&gt;<xliff:g id="device_name" example="Chromebook">%2$s</xliff:g>&lt;/strong&gt;?</string>



    <!-- Summary for associating an application with a companion device of VIRTUAL_DEVICE profile [CHAR LIMIT=NONE] -->

    <string name="summary_virtual_device"><xliff:g id="app_name" example="Exo">%2$s</xliff:g> will have access to anything that’s played on <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g>.&lt;br/>&lt;br/><xliff:g id="app_name" example="Exo">%2$s</xliff:g> will be able to stream audio to <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g> until you remove access to this permission.</string>

    <string name="summary_virtual_device"><xliff:g id="app_name" example="Exo">%2$s</xliff:g> will be granted the following permissions:</string>



    <!-- ================= null profile ================= -->

services/companion/java/com/android/server/companion/utils/RolesUtils.java

+6 −1
Original line number Diff line number Diff line
@@ -19,15 +19,18 @@ package com.android.server.companion.utils; 
import static android.app.role.RoleManager.MANAGE_HOLDERS_FLAG_DONT_KILL_APP;

import static android.companion.AssociationRequest.DEVICE_PROFILE_COMPUTER;

import static android.companion.AssociationRequest.DEVICE_PROFILE_GLASSES;

import static android.companion.AssociationRequest.DEVICE_PROFILE_VIRTUAL_DEVICE;

import static android.companion.AssociationRequest.DEVICE_PROFILE_WATCH;

import static android.companion.CompanionResources.PERMISSION_CALENDAR;

import static android.companion.CompanionResources.PERMISSION_CALL_LOGS;

import static android.companion.CompanionResources.PERMISSION_CHANGE_MEDIA_OUTPUT;

import static android.companion.CompanionResources.PERMISSION_CONTACTS;

import static android.companion.CompanionResources.PERMISSION_CREATE_VIRTUAL_DEVICE;

import static android.companion.CompanionResources.PERMISSION_MICROPHONE;

import static android.companion.CompanionResources.PERMISSION_NEARBY_DEVICES;

import static android.companion.CompanionResources.PERMISSION_NOTIFICATIONS;

import static android.companion.CompanionResources.PERMISSION_PHONE;

import static android.companion.CompanionResources.PERMISSION_POST_NOTIFICATIONS;

import static android.companion.CompanionResources.PERMISSION_SMS;

import static android.companion.CompanionResources.PERMISSION_STORAGE;
@@ -65,7 +68,9 @@ public final class RolesUtils { 
                    PERMISSION_NEARBY_DEVICES, PERMISSION_CHANGE_MEDIA_OUTPUT),

            DEVICE_PROFILE_GLASSES, Arrays.asList(

                    PERMISSION_NOTIFICATIONS, PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS,

                    PERMISSION_MICROPHONE, PERMISSION_NEARBY_DEVICES)

                    PERMISSION_MICROPHONE, PERMISSION_NEARBY_DEVICES),

            DEVICE_PROFILE_VIRTUAL_DEVICE, Arrays.asList(PERMISSION_CREATE_VIRTUAL_DEVICE,

                            PERMISSION_NEARBY_DEVICES, PERMISSION_POST_NOTIFICATIONS)

    );



    private static final Set<String> ROLELESS_DEVICE_PROFILES;