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

Commit 590a6b29 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix matches deviceId base on flag" into main

parents f3289722 f4fb5397

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;

        };