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

Commit fec9fe98 authored by Marco Loaiza's avatar Marco Loaiza Committed by Android (Google) Code Review
Browse files

Merge "Telecom: Refactor to move DEVICE_ID_DEFAULT from vdm to Context" into udc-dev

parents 349bc9d2 debe73b2

tests/src/com/android/server/telecom/tests/ComponentContextFixture.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ import java.util.Locale; 
import java.util.Map;

import java.util.concurrent.Executor;



import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;

import static android.content.Context.DEVICE_ID_DEFAULT;



import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.matches;