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

Commit a39cb4ae authored by Raphael Kim's avatar Raphael Kim Committed by Android (Google) Code Review
Browse files

Merge "Always log device disassociation"

parents 77ee161d 96a2bfae

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

+3 −5
Original line number Diff line number Diff line
@@ -607,10 +607,8 @@ public class CompanionDeviceManagerService extends SystemService { 


        @Override

        public void legacyDisassociate(String deviceMacAddress, String packageName, int userId) {

            if (DEBUG) {

            Log.i(TAG, "legacyDisassociate() pkg=u" + userId + "/" + packageName

                    + ", macAddress=" + deviceMacAddress);

            }



            requireNonNull(deviceMacAddress);

            requireNonNull(packageName);
@@ -622,7 +620,7 @@ public class CompanionDeviceManagerService extends SystemService { 


        @Override

        public void disassociate(int associationId) {

            if (DEBUG) Log.i(TAG, "disassociate() associationId=" + associationId);

            Log.i(TAG, "disassociate() associationId=" + associationId);



            final AssociationInfo association =

                    getAssociationWithCallerChecks(associationId);