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

Commit 0a768311 authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Make sure sendresult after association was created" into sc-v2-dev am: e1211c67 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16132112

Change-Id: I57376842363715ca36596d814a06f28acc8e9b54
parents 5ea0e648 e1211c67

core/java/android/companion/ICompanionDeviceDiscoveryService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ oneway interface ICompanionDeviceDiscoveryService { 
        in String callingPackage,

        in IFindDeviceCallback findCallback,

        in AndroidFuture<Association> serviceCallback);



    void onAssociationCreated();

}

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

+7 −1
Original line number Diff line number Diff line
@@ -254,8 +254,14 @@ public class CompanionDeviceActivity extends Activity { 
        Log.i(LOG_TAG, "onDeviceConfirmed(selectedDevice = " + selectedDevice + ")");

        getService().onDeviceSelected(

                getCallingPackage(), getDeviceMacAddress(selectedDevice.device));

    }



    void setResultAndFinish() {

        Log.i(LOG_TAG, "setResultAndFinish(selectedDevice = "

                + getService().mSelectedDevice.device + ")");

        setResult(RESULT_OK,

                new Intent().putExtra(CompanionDeviceManager.EXTRA_DEVICE, selectedDevice.device));

                new Intent().putExtra(

                        CompanionDeviceManager.EXTRA_DEVICE, getService().mSelectedDevice.device));

        finish();

    }

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

+10 −0
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ public class CompanionDeviceDiscoveryService extends Service { 
                    CompanionDeviceDiscoveryService::startDiscovery,

                    CompanionDeviceDiscoveryService.this, request));

        }



        @Override

        public void onAssociationCreated() {

            Handler.getMain().post(CompanionDeviceDiscoveryService.this::onAssociationCreated);

        }

    };



    private ScanCallback mBLEScanCallback;
@@ -222,6 +227,11 @@ public class CompanionDeviceDiscoveryService extends Service { 
                SCAN_TIMEOUT);

    }



    @MainThread

    private void onAssociationCreated() {

        mActivity.setResultAndFinish();

    }



    private boolean shouldScan(List<? extends DeviceFilter> mediumSpecificFilters) {

        return !isEmpty(mediumSpecificFilters) || isEmpty(mFilters);

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -457,6 +457,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
            }, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> {

                if (err == null) {

                    addAssociation(association, userId);

                    mServiceConnectors.forUser(userId).post(service -> {

                        service.onAssociationCreated();

                    });

                } else {

                    Slog.e(LOG_TAG, "Failed to discover device(s)", err);

                    callback.onFailure("No devices found: " + err.getMessage());