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

Commit 380cf3b6 authored by Tom Chan's avatar Tom Chan Committed by Android (Google) Code Review
Browse files

Merge "Use WEARABLE_SENSING CDM device profile in WearableSensingSecureChannel" into main

parents cb5cdb72 4dbb656e

services/core/java/com/android/server/wearable/WearableSensingManagerPerUserService.java

+3 −0
Original line number Diff line number Diff line
@@ -273,6 +273,9 @@ final class WearableSensingManagerPerUserService 


                                    @Override

                                    public void onError() {

                                        synchronized (mLock) {

                                            ensureRemoteServiceInitiated();

                                        }

                                        synchronized (mSecureChannelLock) {

                                            if (mSecureChannel != null

                                                    && mSecureChannel

services/core/java/com/android/server/wearable/WearableSensingSecureChannel.java

+3 −1
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ final class WearableSensingSecureChannel { 
                    new AssociationRequest.Builder()

                            .setDisplayName(CDM_ASSOCIATION_DISPLAY_NAME)

                            .setSelfManaged(true)

                            .setDeviceProfile(AssociationRequest.DEVICE_PROFILE_WEARABLE_SENSING)

                            .build(),

                    mLightWeightExecutor,

                    new CompanionDeviceManager.Callback() {
@@ -195,7 +196,8 @@ final class WearableSensingSecureChannel { 
            mCompanionDeviceManager.attachSystemDataTransport(

                    associationId,

                    new AutoCloseInputStream(mUnderlyingTransport),

                    new AutoCloseOutputStream(mUnderlyingTransport));

                    new AutoCloseOutputStream(mUnderlyingTransport),

                    CompanionDeviceManager.TRANSPORT_FLAG_EXTEND_PATCH_DIFF);

        }

    }