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

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

Merge "Update connected devices sets when app is killed" into tm-dev am:... 

Merge "Update connected devices sets when app is killed" into tm-dev am: 6f8c988b am: 7cec5a96 am: 84f223be am: efb410d6

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



Change-Id: Ib728ba22bfff7ffd86d14ff603e9a2cf3de286d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 274f589e efb410d6

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

+9 −0
Original line number Diff line number Diff line
@@ -306,6 +306,15 @@ public class CompanionDeviceManagerService extends SystemService { 


    private boolean onCompanionApplicationBindingDiedInternal(

            @UserIdInt int userId, @NonNull String packageName) {

        // Update the current connected devices sets when binderDied, so that application is able

        // to call notifyDeviceAppeared after re-launch the application.

        for (AssociationInfo ai :

                mAssociationStore.getAssociationsForPackage(userId, packageName)) {

            int id = ai.getId();

            Slog.i(TAG, "Removing association id: " + id + " for package: "

                    + packageName + " due to binderDied.");

            mDevicePresenceMonitor.removeDeviceFromMonitoring(id);

        }

        // TODO(b/218613015): implement.

        return false;

    }

services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java

+10 −3
Original line number Diff line number Diff line
@@ -205,6 +205,15 @@ public class CompanionDevicePresenceMonitor implements AssociationStore.OnChange 
        mCallback.onDeviceDisappeared(goneDeviceAssociationId);

    }



    /**

     * Remove the current connected devices by associationId.

     */

    public void removeDeviceFromMonitoring(int associationId) {

        mConnectedBtDevices.remove(associationId);

        mNearbyBleDevices.remove(associationId);

        mReportedSelfManagedDevices.remove(associationId);

    }



    /**

     * Implements

     * {@link AssociationStore.OnChangeListener#onAssociationRemoved(AssociationInfo)}
@@ -217,9 +226,7 @@ public class CompanionDevicePresenceMonitor implements AssociationStore.OnChange 
            Log.d(TAG, "  > association=" + association);

        }



        mConnectedBtDevices.remove(id);

        mNearbyBleDevices.remove(id);

        mReportedSelfManagedDevices.remove(id);

        removeDeviceFromMonitoring(id);



        // Do NOT call mCallback.onDeviceDisappeared()!

        // CompanionDeviceManagerService will know that the association is removed, and will do