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

Commit 120a7729 authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

Merge "Don't send onDeviceDisappeared when device is connected" into sc-dev am: 3eb77b2f 

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

Change-Id: Ie748225d92fff1a85c898d41c6f0dc8a596581fd
parents 284394d7 3eb77b2f

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

+13 −1
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
        Date lastSeen = mDevicesLastNearby.get(address);

        if (isDeviceDisappeared(lastSeen)) {

            onDeviceDisappeared(address);

            unscheduleTriggerDeviceDisappearedRunnable(address);

        }

    }
@@ -1252,9 +1253,20 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
        @Override

        public void run() {

            Slog.d(LOG_TAG, "TriggerDeviceDisappearedRunnable.run(address = " + mAddress + ")");

            if (!mCurrentlyConnectedDevices.contains(mAddress)) {

                onDeviceDisappeared(mAddress);

            }

        }

    }



    private void unscheduleTriggerDeviceDisappearedRunnable(String address) {

        Runnable r = mTriggerDeviceDisappearedRunnables.get(address);

        if (r != null) {

            Slog.d(LOG_TAG,

                    "unscheduling TriggerDeviceDisappearedRunnable(address = " + address + ")");

            mMainHandler.removeCallbacks(r);

        }

    }



    private Set<Association> getAllAssociations(String deviceAddress) {

        List<UserInfo> aliveUsers = mUserManager.getAliveUsers();