| commit | d522b374a087b037ed9d8e8a75f3da3d7e760faf | [log] [tgz] |
|---|---|---|
| author | KOUSHIK PANUGANTI <kpanuganti@google.com> | Fri Apr 06 15:57:33 2018 -0700 |
| committer | KOUSHIK PANUGANTI <kpanuganti@google.com> | Fri Apr 06 15:57:33 2018 -0700 |
| tree | 27ba76a20deb9606b676d0becd8b0a672877973d | |
| parent | c339ec26a0c89a1545a71e67d256fec2d5b7869b [diff] |
Migrated various package under packages/services/Telecomm/testapps to Androidx Bug: 76692459 Test: make TelecomTestApps Change-Id: I27a496b621e8c7cf3ba5b15512f4fcb39db7bc84
diff --git a/testapps/Android.mk b/testapps/Android.mk index b600dca..0651a87 100644 --- a/testapps/Android.mk +++ b/testapps/Android.mk
@@ -17,8 +17,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_USE_AAPT2 := true +LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4 LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-v4 \ android-ex-camera2 \ guava
diff --git a/testapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java b/testapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java index 2d43e76..1549443 100644 --- a/testapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java +++ b/testapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
@@ -22,7 +22,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telecom.VideoProfile;
diff --git a/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java b/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java index 52dcadb..6fce2c9 100644 --- a/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java +++ b/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
@@ -25,7 +25,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.telecom.Conference; import android.telecom.Connection; import android.telecom.DisconnectCause;