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

Commit d20c7c08 authored by Evan Chen's avatar Evan Chen
Browse files

Fix mCachedAssociations for multiple users 

There's no need clearCallingIdentity for add a new association
since we setup our mCachedAssociations as an array and the index
is the user id. We will store all the associations at index 0, if we use
clearCallingIdentity. Furthermore we alreay called withCleanCallingIdentity
when call updateSpecialAccessPermissionForAssociatedPackage.

Fix: 185617756, 186795393
Test: Manual
Change-Id: I16d443b33e15873d29e6c5a652af9b29274fbf29
parent e6fb6087

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

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



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



                final long callingIdentity = Binder.clearCallingIdentity();

                try {

                if (err == null) {

                    addAssociation(association);

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

                }

                cleanup();

                } finally {

                    Binder.restoreCallingIdentity(callingIdentity);

                }

            }));

        }