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

Commit 30769993 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrated various package under packages/services/Telecomm/testapps to Androidx"

parents af5af8d8 d522b374

testapps/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

testapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.content.Context; 
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;

testapps/src/com/android/server/telecom/testapps/TestConnectionService.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.media.MediaPlayer; 
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;