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

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

Merge "Fix mCachedAssociations for multiple users" into sc-dev am: 10778dd4 

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

Change-Id: Ieba25bbfbb185e3613b69c6b238aabcbf43609cf
parents b493035a 10778dd4

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

+6 −12
Original line number Original line Diff line number Diff line
@@ -454,9 +454,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
                }).cancelTimeout();

                }).cancelTimeout();





            }, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> {

            }, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> {



                final long callingIdentity = Binder.clearCallingIdentity();

                try {

                if (err == null) {

                if (err == null) {

                    addAssociation(association);

                    addAssociation(association);

                } else {

                } else {
@@ -464,9 +461,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
                    callback.onFailure("No devices found: " + err.getMessage());

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

                }

                }

                cleanup();

                cleanup();

                } finally {

                    Binder.restoreCallingIdentity(callingIdentity);

                }

            }));

            }));

        }

        }