From 000bec9fbeb1b50ae7ac2f64ec68e54a403a870c Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Thu, 12 Dec 2019 14:19:27 -0800 Subject: [PATCH] Move RCS UCE out of Telephony Mainline Telephony Mainline does not interact with UCE, therefore it should not be included as mainline. Test: build taimen; build coral; manual test uce Change-Id: I743228939e648689ff9e73d9af2ffb7b90feb3b2 --- .../java/com/android/ims/internal/uce/common/CapInfo.aidl | 0 .../java/com/android/ims/internal/uce/common/CapInfo.java | 0 .../java/com/android/ims/internal/uce/common/StatusCode.aidl | 0 .../java/com/android/ims/internal/uce/common/StatusCode.java | 0 .../java/com/android/ims/internal/uce/common/UceLong.aidl | 0 .../java/com/android/ims/internal/uce/common/UceLong.java | 0 .../com/android/ims/internal/uce/options/IOptionsListener.aidl | 0 .../com/android/ims/internal/uce/options/IOptionsService.aidl | 0 .../java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl | 0 .../java/com/android/ims/internal/uce/options/OptionsCapInfo.java | 0 .../java/com/android/ims/internal/uce/options/OptionsCmdId.aidl | 0 .../java/com/android/ims/internal/uce/options/OptionsCmdId.java | 0 .../com/android/ims/internal/uce/options/OptionsCmdStatus.aidl | 0 .../com/android/ims/internal/uce/options/OptionsCmdStatus.java | 0 .../com/android/ims/internal/uce/options/OptionsSipResponse.aidl | 0 .../com/android/ims/internal/uce/options/OptionsSipResponse.java | 0 .../com/android/ims/internal/uce/presence/IPresenceListener.aidl | 0 .../com/android/ims/internal/uce/presence/IPresenceService.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresCapInfo.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresCapInfo.java | 0 .../java/com/android/ims/internal/uce/presence/PresCmdId.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresCmdId.java | 0 .../java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresCmdStatus.java | 0 .../android/ims/internal/uce/presence/PresPublishTriggerType.aidl | 0 .../android/ims/internal/uce/presence/PresPublishTriggerType.java | 0 .../java/com/android/ims/internal/uce/presence/PresResInfo.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresResInfo.java | 0 .../android/ims/internal/uce/presence/PresResInstanceInfo.aidl | 0 .../android/ims/internal/uce/presence/PresResInstanceInfo.java | 0 .../java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresRlmiInfo.java | 0 .../com/android/ims/internal/uce/presence/PresServiceInfo.aidl | 0 .../com/android/ims/internal/uce/presence/PresServiceInfo.java | 0 .../com/android/ims/internal/uce/presence/PresSipResponse.aidl | 0 .../com/android/ims/internal/uce/presence/PresSipResponse.java | 0 .../android/ims/internal/uce/presence/PresSubscriptionState.aidl | 0 .../android/ims/internal/uce/presence/PresSubscriptionState.java | 0 .../java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl | 0 .../java/com/android/ims/internal/uce/presence/PresTupleInfo.java | 0 .../com/android/ims/internal/uce/uceservice/IUceListener.aidl | 0 .../java/com/android/ims/internal/uce/uceservice/IUceService.aidl | 0 .../com/android/ims/internal/uce/uceservice/ImsUceManager.java | 0 .../com/android/ims/internal/uce/uceservice/UceServiceBase.java | 0 44 files changed, 0 insertions(+), 0 deletions(-) rename {telephony => core}/java/com/android/ims/internal/uce/common/CapInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/common/CapInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/common/StatusCode.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/common/StatusCode.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/common/UceLong.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/common/UceLong.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/IOptionsListener.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/IOptionsService.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsCapInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsCmdId.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/options/OptionsSipResponse.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/IPresenceService.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresCapInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresCmdId.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresCmdId.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresCmdStatus.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresResInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresResInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresServiceInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresSipResponse.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/presence/PresTupleInfo.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/uceservice/IUceService.aidl (100%) rename {telephony => core}/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java (100%) rename {telephony => core}/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java (100%) diff --git a/telephony/java/com/android/ims/internal/uce/common/CapInfo.aidl b/core/java/com/android/ims/internal/uce/common/CapInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/common/CapInfo.aidl rename to core/java/com/android/ims/internal/uce/common/CapInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/common/CapInfo.java b/core/java/com/android/ims/internal/uce/common/CapInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/common/CapInfo.java rename to core/java/com/android/ims/internal/uce/common/CapInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/common/StatusCode.aidl b/core/java/com/android/ims/internal/uce/common/StatusCode.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/common/StatusCode.aidl rename to core/java/com/android/ims/internal/uce/common/StatusCode.aidl diff --git a/telephony/java/com/android/ims/internal/uce/common/StatusCode.java b/core/java/com/android/ims/internal/uce/common/StatusCode.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/common/StatusCode.java rename to core/java/com/android/ims/internal/uce/common/StatusCode.java diff --git a/telephony/java/com/android/ims/internal/uce/common/UceLong.aidl b/core/java/com/android/ims/internal/uce/common/UceLong.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/common/UceLong.aidl rename to core/java/com/android/ims/internal/uce/common/UceLong.aidl diff --git a/telephony/java/com/android/ims/internal/uce/common/UceLong.java b/core/java/com/android/ims/internal/uce/common/UceLong.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/common/UceLong.java rename to core/java/com/android/ims/internal/uce/common/UceLong.java diff --git a/telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl rename to core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl diff --git a/telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl rename to core/java/com/android/ims/internal/uce/options/IOptionsService.aidl diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl rename to core/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java rename to core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl rename to core/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java rename to core/java/com/android/ims/internal/uce/options/OptionsCmdId.java diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl rename to core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java rename to core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl rename to core/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java rename to core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl rename to core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl rename to core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl rename to core/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java rename to core/java/com/android/ims/internal/uce/presence/PresCapInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.aidl b/core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresCmdId.aidl rename to core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java rename to core/java/com/android/ims/internal/uce/presence/PresCmdId.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl rename to core/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java rename to core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl rename to core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java rename to core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.aidl b/core/java/com/android/ims/internal/uce/presence/PresResInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresResInfo.aidl rename to core/java/com/android/ims/internal/uce/presence/PresResInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java rename to core/java/com/android/ims/internal/uce/presence/PresResInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl rename to core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java rename to core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl rename to core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java rename to core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl rename to core/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java rename to core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl rename to core/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java rename to core/java/com/android/ims/internal/uce/presence/PresSipResponse.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl rename to core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java rename to core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl rename to core/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java rename to core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl rename to core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl similarity index 100% rename from telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl rename to core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java b/core/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java rename to core/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java b/core/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java similarity index 100% rename from telephony/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java rename to core/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java