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

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

Fix matches deviceId base on flag 

When the flag is not on, we consider there's no deviceId matches.

Test: cts
Bug: 381347949
Flag: EXEMPT trivial bugfix
Change-Id: I08cd612f9c62e0615eb02a41124170847de68d8d
parent 7879f67a

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

+3 −3
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ class BackupRestoreProcessor { 
            boolean matchesMacAddress = Objects.equals(

                    associationInfo.getDeviceMacAddress(),

                    restored.getDeviceMacAddress());

            boolean matchesDeviceId = !Flags.associationTag()

                    || (associationInfo.getDeviceId() != null

            boolean matchesDeviceId = Flags.associationTag()

                    && (associationInfo.getDeviceId() != null

                    && associationInfo.getDeviceId().isSameDevice(restored.getDeviceId()));

            return matchesMacAddress || matchesDeviceId;

        };