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

Commit c35acc23 authored by Claudiu Ghioc's avatar Claudiu Ghioc
Browse files

Add CDM profile for "nearby_device_streaming" 



* add CDM profile and signature | privileged permission to use the
profile
* add the profile and the permission to the map of valid roles on the
service side
* update the CompanionDeviceActivity to handle the
nearby_device_streaming profile
* add relevant strings and icon for nearby_device_streaming
* add "nearby_device_streaming" to MetricUtils

Bug: 256140614
Test: atest CtsCompanionDeviceManagerCoreTestCases
Test: atest CtsCompanionDeviceManagerNoCompanionServicesTestCases
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases

Change-Id: I1a45395bcdbb13cf131bc7fb49d17d7928d76296
Signed-off-by: default avatarClaudiu Ghioc <claudiughioc@google.com>
parent d1f69b02

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ package android { 
    field public static final String REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION = "android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION";

    field public static final String REQUEST_COMPANION_PROFILE_COMPUTER = "android.permission.REQUEST_COMPANION_PROFILE_COMPUTER";

    field public static final String REQUEST_COMPANION_PROFILE_GLASSES = "android.permission.REQUEST_COMPANION_PROFILE_GLASSES";

    field public static final String REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING = "android.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING";

    field public static final String REQUEST_COMPANION_PROFILE_WATCH = "android.permission.REQUEST_COMPANION_PROFILE_WATCH";

    field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND";

    field public static final String REQUEST_COMPANION_SELF_MANAGED = "android.permission.REQUEST_COMPANION_SELF_MANAGED";
@@ -9054,6 +9055,7 @@ package android.companion { 
    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION) public static final String DEVICE_PROFILE_AUTOMOTIVE_PROJECTION = "android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER) public static final String DEVICE_PROFILE_COMPUTER = "android.app.role.COMPANION_DEVICE_COMPUTER";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_GLASSES) public static final String DEVICE_PROFILE_GLASSES = "android.app.role.COMPANION_DEVICE_GLASSES";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING) public static final String DEVICE_PROFILE_NEARBY_DEVICE_STREAMING = "android.app.role.COMPANION_DEVICE_NEARBY_DEVICE_STREAMING";

    field public static final String DEVICE_PROFILE_WATCH = "android.app.role.COMPANION_DEVICE_WATCH";

  }

























core/java/android/companion/AssociationRequest.java



+15
−1




























Original line number
Diff line number
Diff line








@@ -101,6 +101,20 @@ public final class AssociationRequest implements Parcelable {













    public static final String DEVICE_PROFILE_APP_STREAMING =















            "android.app.role.COMPANION_DEVICE_APP_STREAMING";





























    /**













     * Device profile: a virtual device capable of rendering content from an Android host to a













     * nearby device.













     *













     * Only applications that have been granted













     * {@link android.Manifest.permission#REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING}













     * are allowed to request to be associated with such devices.













     *













     * @see AssociationRequest.Builder#setDeviceProfile













     */













    @RequiresPermission(Manifest.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING)













    public static final String DEVICE_PROFILE_NEARBY_DEVICE_STREAMING =













            "android.app.role.COMPANION_DEVICE_NEARBY_DEVICE_STREAMING";





























    /**















     * Device profile: Android Automotive Projection















     *










@@ -132,7 +146,7 @@ public final class AssociationRequest implements Parcelable {













    @Retention(RetentionPolicy.SOURCE)















    @StringDef(value = { DEVICE_PROFILE_WATCH, DEVICE_PROFILE_COMPUTER,















            DEVICE_PROFILE_AUTOMOTIVE_PROJECTION, DEVICE_PROFILE_APP_STREAMING,













            DEVICE_PROFILE_GLASSES })













            DEVICE_PROFILE_GLASSES, DEVICE_PROFILE_NEARBY_DEVICE_STREAMING })















    public @interface DeviceProfile {}































    /**

































core/res/AndroidManifest.xml



+8
−0




























Original line number
Diff line number
Diff line








@@ -3366,6 +3366,14 @@













    <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING"















                android:protectionLevel="signature|privileged" />





























    <!-- Allows application to request to stream content from an Android host to a nearby device













         ({@link android.companion.AssociationRequest#DEVICE_PROFILE_NEARBY_DEVICE_STREAMING})













         by {@link android.companion.CompanionDeviceManager}.













        <p>Not for use by third-party applications.













    -->













    <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING"













        android:protectionLevel="signature|privileged" />





























    <!-- Allows application to request to be associated with a vehicle head unit capable of















         automotive projection















         ({@link android.companion.AssociationRequest#DEVICE_PROFILE_AUTOMOTIVE_PROJECTION})

































data/etc/privapp-permissions-platform.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -386,6 +386,7 @@ applications that come with the platform













        <permission name="android.permission.MANAGE_COMPANION_DEVICES" />















        <permission name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING" />















        <permission name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" />













        <permission name="android.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING" />















        <permission name="android.permission.REQUEST_COMPANION_PROFILE_COMPUTER" />















        <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED" />















        <!-- Permission required for testing registering pull atom callbacks. -->

































packages/CompanionDeviceManager/res/drawable/ic_permission_nearby_device_streaming.xml
0 → 100644



+28
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













  ~ Copyright (C) 2022 The Android Open Source Project













  ~













  ~ Licensed under the Apache License, Version 2.0 (the "License");













  ~ you may not use this file except in compliance with the License.













  ~ You may obtain a copy of the License at













  ~













  ~      http://www.apache.org/licenses/LICENSE-2.0













  ~













  ~ Unless required by applicable law or agreed to in writing, software













  ~ distributed under the License is distributed on an "AS IS" BASIS,













  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













  ~ See the License for the specific language governing permissions and













  ~ limitations under the License.













  -->



























<vector xmlns:android="http://schemas.android.com/apk/res/android"













        android:width="24dp"













        android:height="24dp"













        android:viewportWidth="24"













        android:viewportHeight="24"













        android:tint="@android:color/system_accent1_600">













    <path













        android:pathData="M6.2529,18.5H16.2529V17.5H18.2529V21.5C18.2529,22.6 17.3529,23.5 16.2529,23.5H6.2529C5.1529,23.5 4.2529,22.6 4.2529,21.5V3.5C4.2529,2.4 5.1529,1.51 6.2529,1.51L16.2529,1.5C17.3529,1.5 18.2529,2.4 18.2529,3.5V7.5H16.2529V6.5H6.2529V18.5ZM16.2529,3.5H6.2529V4.5H16.2529V3.5ZM6.2529,21.5V20.5H16.2529V21.5H6.2529ZM12.6553,9.4049C12.6553,8.8526 13.103,8.4049 13.6553,8.4049H20.5254C21.0776,8.4049 21.5254,8.8526 21.5254,9.4049V14.6055C21.5254,15.1578 21.0776,15.6055 20.5254,15.6055H14.355L12.6553,17.0871V9.4049Z"













        android:fillColor="#3C4043"













        android:fillType="evenOdd"/>













</vector>










 No newline at end of file