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

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

Merge "[CDM] Use config_companionDeviceManagerPackage instead of hard coded string" into main

parents 49bc7460 ee6ea5aa

core/java/android/companion/CompanionDeviceManager.java

+0 −8
Original line number Diff line number Diff line
@@ -207,14 +207,6 @@ public final class CompanionDeviceManager { 
     */

    public static final String EXTRA_ASSOCIATION = "android.companion.extra.ASSOCIATION";



    /**

     * The package name of the companion device discovery component.

     *

     * @hide

     */

    public static final String COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME =

            "com.android.companiondevicemanager";



    /**

     * Callback for applications to receive updates about and the outcome of

     * {@link AssociationRequest} issued via {@code associate()} call.

core/res/res/values/config.xml

+3 −3
Original line number Diff line number Diff line
@@ -4384,12 +4384,12 @@ 
         Example: "com.android.companiondevicemanager"

         See android.companion.CompanionDeviceManager.

    -->

    <string name="config_companionDeviceManagerPackage" translatable="false"></string>

    <string name="config_companionDeviceManagerPackage" translatable="false">com.android.companiondevicemanager</string>



    <!-- A list of packages managing companion device(s) by the same manufacturers as the main

         device. It will fall back to showing a prompt if the association has been called multiple

         times in a short period.

         Note that config_companionDeviceManagerPackage and config_companionDeviceCerts are

         Note that config_companionDevicePackages and config_companionDeviceCerts are

         parallel arrays.

     -->

    <string-array name="config_companionDevicePackages" translatable="false"></string-array>
@@ -4397,7 +4397,7 @@ 
    <!-- A list of SHA256 Certificates managing companion device(s) by the same manufacturers as

         the main device. It will fall back to showing a prompt if the association has been called

         multiple times in a short period.

         Note that config_companionDeviceCerts and config_companionDeviceManagerPackage are parallel

         Note that config_companionDeviceCerts and config_companionDevicePackages are parallel

         arrays.

         Example: "1A:2B:3C:4D"

     -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ 
  <java-symbol type="string" name="cfTemplateRegisteredTime" />

  <java-symbol type="string" name="chooseActivity" />

  <java-symbol type="string" name="checked" />

  <java-symbol type="string" name="config_companionDeviceManagerPackage" />

  <java-symbol type="array" name="config_companionDevicePackages" />

  <java-symbol type="array" name="config_companionDeviceCerts" />

  <java-symbol type="string" name="config_default_dns_server" />

services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java

+8 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.companion; 
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;

import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.app.PendingIntent.FLAG_ONE_SHOT;

import static android.companion.CompanionDeviceManager.COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME;

import static android.companion.CompanionDeviceManager.REASON_INTERNAL_ERROR;

import static android.companion.CompanionDeviceManager.RESULT_INTERNAL_ERROR;

import static android.content.ComponentName.createRelative;
@@ -60,6 +59,7 @@ import android.util.Log; 
import android.util.PackageUtils;

import android.util.Slog;



import com.android.internal.R;

import com.android.internal.util.ArrayUtils;



import java.util.Arrays;
@@ -114,9 +114,6 @@ import java.util.Set; 
class AssociationRequestsProcessor {

    private static final String TAG = "CDM_AssociationRequestsProcessor";



    private static final ComponentName ASSOCIATION_REQUEST_APPROVAL_ACTIVITY =

            createRelative(COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME, ".CompanionDeviceActivity");



    // AssociationRequestsProcessor <-> UI

    private static final String EXTRA_APPLICATION_CALLBACK = "application_callback";

    private static final String EXTRA_ASSOCIATION_REQUEST = "association_request";
@@ -138,6 +135,8 @@ class AssociationRequestsProcessor { 
    private final @NonNull CompanionDeviceManagerService mService;

    private final @NonNull PackageManagerInternal mPackageManager;

    private final @NonNull AssociationStoreImpl mAssociationStore;

    @NonNull

    private final ComponentName mCompanionDeviceActivity;



    AssociationRequestsProcessor(@NonNull CompanionDeviceManagerService service,

            @NonNull AssociationStoreImpl associationStore) {
@@ -145,6 +144,9 @@ class AssociationRequestsProcessor { 
        mService = service;

        mPackageManager = service.mPackageManagerInternal;

        mAssociationStore = associationStore;

        mCompanionDeviceActivity = createRelative(

                mContext.getString(R.string.config_companionDeviceManagerPackage),

                ".CompanionDeviceActivity");

    }



    /**
@@ -197,7 +199,7 @@ class AssociationRequestsProcessor { 
        extras.putParcelable(EXTRA_RESULT_RECEIVER, prepareForIpc(mOnRequestConfirmationReceiver));



        final Intent intent = new Intent();

        intent.setComponent(ASSOCIATION_REQUEST_APPROVAL_ACTIVITY);

        intent.setComponent(mCompanionDeviceActivity);

        intent.putExtras(extras);



        // 2b.3. Create a PendingIntent.
@@ -224,7 +226,7 @@ class AssociationRequestsProcessor { 
        extras.putBoolean(EXTRA_FORCE_CANCEL_CONFIRMATION, true);



        final Intent intent = new Intent();

        intent.setComponent(ASSOCIATION_REQUEST_APPROVAL_ACTIVITY);

        intent.setComponent(mCompanionDeviceActivity);

        intent.putExtras(extras);



        return createPendingIntent(packageUid, intent);

services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java

+6 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.companion.datatransfer; 
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;

import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.app.PendingIntent.FLAG_ONE_SHOT;

import static android.companion.CompanionDeviceManager.COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME;

import static android.content.ComponentName.createRelative;



import static com.android.server.companion.Utils.prepareForIpc;
@@ -48,6 +47,7 @@ import android.os.UserHandle; 
import android.permission.PermissionControllerManager;

import android.util.Slog;



import com.android.internal.R;

import com.android.server.companion.AssociationStore;

import com.android.server.companion.CompanionDeviceManagerService;

import com.android.server.companion.PermissionsUtils;
@@ -75,9 +75,6 @@ public class SystemDataTransferProcessor { 
    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";

    private static final ComponentName SYSTEM_DATA_TRANSFER_REQUEST_APPROVAL_ACTIVITY =

            createRelative(COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME,

                    ".CompanionDeviceDataTransferActivity");



    private final Context mContext;

    private final AssociationStore mAssociationStore;
@@ -85,6 +82,7 @@ public class SystemDataTransferProcessor { 
    private final CompanionTransportManager mTransportManager;

    private final PermissionControllerManager mPermissionControllerManager;

    private final ExecutorService mExecutor;

    private final ComponentName mCompanionDeviceDataTransferActivity;



    public SystemDataTransferProcessor(CompanionDeviceManagerService service,

            AssociationStore associationStore,
@@ -108,6 +106,9 @@ public class SystemDataTransferProcessor { 
        mTransportManager.addListener(MESSAGE_REQUEST_PERMISSION_RESTORE, messageListener);

        mPermissionControllerManager = mContext.getSystemService(PermissionControllerManager.class);

        mExecutor = Executors.newSingleThreadExecutor();

        mCompanionDeviceDataTransferActivity = createRelative(

                mContext.getString(R.string.config_companionDeviceManagerPackage),

                ".CompanionDeviceDataTransferActivity");

    }



    /**
@@ -146,7 +147,7 @@ public class SystemDataTransferProcessor { 
                prepareForIpc(mOnSystemDataTransferRequestConfirmationReceiver));



        final Intent intent = new Intent();

        intent.setComponent(SYSTEM_DATA_TRANSFER_REQUEST_APPROVAL_ACTIVITY);

        intent.setComponent(mCompanionDeviceDataTransferActivity);

        intent.putExtras(extras);



        // Create a PendingIntent