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

Commit 43cc8a94 authored by Marco Loaiza's avatar Marco Loaiza Committed by Automerger Merge Worker
Browse files

Merge "Telecom: Refactor to move DEVICE_ID_DEFAULT from vdm to Context" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/21464956



Change-Id: I90b0ac58bcfe29a2a0c60254dc6385053bb0187e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aac8e722 b5c3cf42

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;