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

Commit e31e7c72 authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "[CDM perm sync] Update user consent text"

parents 3da45a48 2831bdd0

core/java/android/companion/AssociationRequest.java

+11 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ public final class AssociationRequest implements Parcelable { 
     * The Display name of the device to be shown in the CDM confirmation UI. Must be non-null for

     * "self-managed" association.

     */

    private final @Nullable CharSequence mDisplayName;

    private @Nullable CharSequence mDisplayName;



    /**

     * Whether the association is to be managed by the companion application.
@@ -301,6 +301,11 @@ public final class AssociationRequest implements Parcelable { 
        mSkipPrompt = value;

    }



    /** @hide */

    public void setDisplayName(CharSequence displayName) {

        mDisplayName = displayName;

    }



    /** @hide */

    @NonNull

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@@ -597,7 +602,9 @@ public final class AssociationRequest implements Parcelable { 
        boolean forceConfirmation = (flg & 0x20) != 0;

        boolean skipPrompt = (flg & 0x400) != 0;

        List<DeviceFilter<?>> deviceFilters = new ArrayList<>();

        in.readParcelableList(deviceFilters, DeviceFilter.class.getClassLoader(), (Class<android.companion.DeviceFilter<?>>) (Class<?>) android.companion.DeviceFilter.class);

        in.readParcelableList(deviceFilters, DeviceFilter.class.getClassLoader(),

                (Class<android.companion.DeviceFilter<?>>) (Class<?>)

                        android.companion.DeviceFilter.class);

        String deviceProfile = (flg & 0x4) == 0 ? null : in.readString();

        CharSequence displayName = (flg & 0x8) == 0 ? null : (CharSequence) in.readCharSequence();

        String packageName = (flg & 0x40) == 0 ? null : in.readString();
@@ -641,10 +648,10 @@ public final class AssociationRequest implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1643238443303L,

            time = 1649179640045L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/companion/AssociationRequest.java",

            inputSignatures = "public static final  java.lang.String DEVICE_PROFILE_WATCH\npublic static final @android.annotation.RequiresPermission java.lang.String DEVICE_PROFILE_APP_STREAMING\npublic static final @android.annotation.RequiresPermission java.lang.String DEVICE_PROFILE_AUTOMOTIVE_PROJECTION\npublic static final @android.annotation.RequiresPermission java.lang.String DEVICE_PROFILE_COMPUTER\nprivate final  boolean mSingleDevice\nprivate final @com.android.internal.util.DataClass.PluralOf(\"deviceFilter\") @android.annotation.NonNull java.util.List<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate final @android.annotation.Nullable @android.companion.AssociationRequest.DeviceProfile java.lang.String mDeviceProfile\nprivate final @android.annotation.Nullable java.lang.CharSequence mDisplayName\nprivate final  boolean mSelfManaged\nprivate final  boolean mForceConfirmation\nprivate @android.annotation.Nullable java.lang.String mPackageName\nprivate @android.annotation.UserIdInt int mUserId\nprivate @android.annotation.Nullable java.lang.String mDeviceProfilePrivilegesDescription\nprivate final  long mCreationTime\nprivate  boolean mSkipPrompt\npublic @android.annotation.Nullable @android.companion.AssociationRequest.DeviceProfile java.lang.String getDeviceProfile()\npublic @android.annotation.Nullable java.lang.CharSequence getDisplayName()\npublic  boolean isSelfManaged()\npublic  boolean isForceConfirmation()\npublic  boolean isSingleDevice()\npublic  void setPackageName(java.lang.String)\npublic  void setUserId(int)\npublic  void setDeviceProfilePrivilegesDescription(java.lang.String)\npublic  void setSkipPrompt(boolean)\npublic @android.annotation.NonNull @android.compat.annotation.UnsupportedAppUsage java.util.List<android.companion.DeviceFilter<?>> getDeviceFilters()\nclass AssociationRequest extends java.lang.Object implements [android.os.Parcelable]\nprivate  boolean mSingleDevice\nprivate @android.annotation.Nullable java.util.ArrayList<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate @android.annotation.Nullable java.lang.String mDeviceProfile\nprivate @android.annotation.Nullable java.lang.CharSequence mDisplayName\nprivate  boolean mSelfManaged\nprivate  boolean mForceConfirmation\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setSingleDevice(boolean)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder addDeviceFilter(android.companion.DeviceFilter<?>)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setDeviceProfile(java.lang.String)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setDisplayName(java.lang.CharSequence)\npublic @android.annotation.RequiresPermission @android.annotation.NonNull android.companion.AssociationRequest.Builder setSelfManaged(boolean)\npublic @android.annotation.RequiresPermission @android.annotation.NonNull android.companion.AssociationRequest.Builder setForceConfirmation(boolean)\npublic @android.annotation.NonNull @java.lang.Override android.companion.AssociationRequest build()\nclass Builder extends android.provider.OneTimeUseBuilder<android.companion.AssociationRequest> implements []\n@com.android.internal.util.DataClass(genConstructor=false, genToString=true, genEqualsHashCode=true, genHiddenGetters=true, genParcelable=true, genConstDefs=false)")

            inputSignatures = "public static final  java.lang.String DEVICE_PROFILE_WATCH\npublic static final @android.annotation.RequiresPermission java.lang.String DEVICE_PROFILE_APP_STREAMING\npublic static final @android.annotation.RequiresPermission java.lang.String DEVICE_PROFILE_AUTOMOTIVE_PROJECTION\npublic static final @android.annotation.RequiresPermission java.lang.String DEVICE_PROFILE_COMPUTER\nprivate final  boolean mSingleDevice\nprivate final @com.android.internal.util.DataClass.PluralOf(\"deviceFilter\") @android.annotation.NonNull java.util.List<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate final @android.annotation.Nullable @android.companion.AssociationRequest.DeviceProfile java.lang.String mDeviceProfile\nprivate @android.annotation.Nullable java.lang.CharSequence mDisplayName\nprivate final  boolean mSelfManaged\nprivate final  boolean mForceConfirmation\nprivate @android.annotation.Nullable java.lang.String mPackageName\nprivate @android.annotation.UserIdInt int mUserId\nprivate @android.annotation.Nullable java.lang.String mDeviceProfilePrivilegesDescription\nprivate final  long mCreationTime\nprivate  boolean mSkipPrompt\npublic @android.annotation.Nullable @android.companion.AssociationRequest.DeviceProfile java.lang.String getDeviceProfile()\npublic @android.annotation.Nullable java.lang.CharSequence getDisplayName()\npublic  boolean isSelfManaged()\npublic  boolean isForceConfirmation()\npublic  boolean isSingleDevice()\npublic  void setPackageName(java.lang.String)\npublic  void setUserId(int)\npublic  void setDeviceProfilePrivilegesDescription(java.lang.String)\npublic  void setSkipPrompt(boolean)\npublic  void setDisplayName(java.lang.CharSequence)\npublic @android.annotation.NonNull @android.compat.annotation.UnsupportedAppUsage java.util.List<android.companion.DeviceFilter<?>> getDeviceFilters()\nclass AssociationRequest extends java.lang.Object implements [android.os.Parcelable]\nprivate  boolean mSingleDevice\nprivate @android.annotation.Nullable java.util.ArrayList<android.companion.DeviceFilter<?>> mDeviceFilters\nprivate @android.annotation.Nullable java.lang.String mDeviceProfile\nprivate @android.annotation.Nullable java.lang.CharSequence mDisplayName\nprivate  boolean mSelfManaged\nprivate  boolean mForceConfirmation\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setSingleDevice(boolean)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder addDeviceFilter(android.companion.DeviceFilter<?>)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setDeviceProfile(java.lang.String)\npublic @android.annotation.NonNull android.companion.AssociationRequest.Builder setDisplayName(java.lang.CharSequence)\npublic @android.annotation.RequiresPermission @android.annotation.NonNull android.companion.AssociationRequest.Builder setSelfManaged(boolean)\npublic @android.annotation.RequiresPermission @android.annotation.NonNull android.companion.AssociationRequest.Builder setForceConfirmation(boolean)\npublic @android.annotation.NonNull @java.lang.Override android.companion.AssociationRequest build()\nclass Builder extends android.provider.OneTimeUseBuilder<android.companion.AssociationRequest> implements []\n@com.android.internal.util.DataClass(genConstructor=false, genToString=true, genEqualsHashCode=true, genHiddenGetters=true, genParcelable=true, genConstDefs=false)")

    @Deprecated

    private void __metadata() {}

packages/CompanionDeviceManager/res/values/strings.xml

+6 −8
Original line number Diff line number Diff line
@@ -107,13 +107,11 @@ 
    <string name="consent_back">Back</string>



    <!-- ================== System data transfer ==================== -->

    <!-- Title of the permission sync confirmation dialog. [CHAR LIMIT=60] -->

    <string name="permission_sync_confirmation_title">Transfer app permissions to your

        watch</string>



    <!-- Text of the permission sync explanation in the confirmation dialog. [CHAR LIMIT=400] -->

    <string name="permission_sync_summary">To make it easier to set up your watch,

        apps installed on your watch during setup will use the same permissions as your phone.\n\n

        These permissions may include access to your watch\u2019s microphone and location.</string>

    <!-- Title of the permission sync confirmation dialog. [CHAR LIMIT=NONE] -->

    <string name="permission_sync_confirmation_title">Give apps on <xliff:g id="companion_device_name" example="Galaxy Watch 5">%1$s</xliff:g> the same permissions as on <xliff:g id="primary_device_name" example="Pixel 6">%2$s</xliff:g>?</string>



    <!-- Text of the permission sync explanation in the confirmation dialog. [CHAR LIMIT=NONE] -->

    <string name="permission_sync_summary">&lt;p&gt;This may include Microphone, Camera, and Location access, and other sensitive permissions on <xliff:g id="companion_device_name" example="Galaxy Watch 5">%1$s</xliff:g>.&lt;/p&gt;

        &lt;p&gt;You can change these permissions any time in your Settings on <xliff:g id="companion_device_name" example="Galaxy Watch 5">%1$s</xliff:g>.&lt;/p&gt;</string>



</resources>

packages/CompanionDeviceManager/res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
    <style name="DescriptionSummary">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:gravity">center</item>

        <item name="android:layout_marginTop">18dp</item>

        <item name="android:layout_marginLeft">18dp</item>

        <item name="android:layout_marginRight">18dp</item>

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements 


    private void onUserSelectedDevice(@NonNull DeviceFilterPair<?> selectedDevice) {

        final MacAddress macAddress = selectedDevice.getMacAddress();

        mRequest.setDisplayName(selectedDevice.getDisplayName());

        onAssociationApproved(macAddress);

    }
@@ -486,6 +487,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements 
        mSelectedDevice = requireNonNull(deviceFilterPairs.get(0));



        final String deviceName = mSelectedDevice.getDisplayName();

        mRequest.setDisplayName(deviceName);

        final Spanned title = getHtmlFromResources(

                this, R.string.confirmation_title, appLabel, deviceName);

        final Spanned summary;

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java

+18 −7
Original line number Diff line number Diff line
@@ -19,15 +19,17 @@ package com.android.companiondevicemanager; 
import static android.companion.datatransfer.SystemDataTransferRequest.DATA_TYPE_PERMISSION_SYNC;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static com.android.companiondevicemanager.Utils.getHtmlFromResources;



import static java.util.Objects.requireNonNull;



import android.app.Activity;

import android.companion.datatransfer.PermissionSyncRequest;

import android.companion.datatransfer.SystemDataTransferRequest;

import android.content.Intent;

import android.os.Build;

import android.os.Bundle;

import android.os.ResultReceiver;

import android.text.Html;

import android.util.Log;

import android.widget.Button;

import android.widget.TextView;
@@ -39,14 +41,18 @@ public class CompanionDeviceDataTransferActivity extends Activity { 


    private static final String LOG_TAG = CompanionDeviceDataTransferActivity.class.getSimpleName();



    // UI -> SystemDataTransferProcessor

    private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED = 0;

    private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED = 1;

    // Intent data keys from SystemDataTransferProcessor

    private static final String EXTRA_PERMISSION_SYNC_REQUEST = "permission_sync_request";

    private static final String EXTRA_COMPANION_DEVICE_NAME = "companion_device_name";

    private static final String EXTRA_SYSTEM_DATA_TRANSFER_RESULT_RECEIVER =

            "system_data_transfer_result_receiver";



    // Intent data keys to SystemDataTransferProcessor

    private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED = 0;

    private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED = 1;



    private SystemDataTransferRequest mRequest;

    private CharSequence mCompanionDeviceName;

    private ResultReceiver mCdmServiceReceiver;



    @Override
@@ -67,16 +73,21 @@ public class CompanionDeviceDataTransferActivity extends Activity { 
        final Intent intent = getIntent();

        mRequest = intent.getParcelableExtra(EXTRA_PERMISSION_SYNC_REQUEST,

                PermissionSyncRequest.class);

        mCompanionDeviceName = intent.getCharSequenceExtra(EXTRA_COMPANION_DEVICE_NAME);

        mCdmServiceReceiver = intent.getParcelableExtra(EXTRA_SYSTEM_DATA_TRANSFER_RESULT_RECEIVER,

                ResultReceiver.class);



        requireNonNull(mRequest);

        requireNonNull(mCdmServiceReceiver);



        final String primaryDeviceName = Build.MODEL;



        if (mRequest.getDataType() == DATA_TYPE_PERMISSION_SYNC) {

            titleView.setText(Html.fromHtml(getString(

                    R.string.permission_sync_confirmation_title), 0));

            summaryView.setText(getString(R.string.permission_sync_summary));

            titleView.setText(getHtmlFromResources(this,

                    R.string.permission_sync_confirmation_title, mCompanionDeviceName,

                    primaryDeviceName));

            summaryView.setText(getHtmlFromResources(this, R.string.permission_sync_summary,

                    mCompanionDeviceName));

            allowButton.setOnClickListener(v -> allow());

            disallowButton.setOnClickListener(v -> disallow());

        }