From 153d31bc37b41a9622379fc6377d320534821d68 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Mon, 7 Oct 2019 17:41:26 -0700
Subject: [PATCH] Move MmsManager and IMms to frameworks/base/mms

Test: basic sanity
Bug: 140763963
Merged-in: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
Change-Id: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
(cherry picked from commit 6237a6b35cd127cc39973b640e25d198466229a7)
---
 Android.bp                                         | 12 ++++++++++++
 mms/OWNERS                                         | 14 ++++++++++++++
 .../java/android/telephony/MmsManager.java         |  0
 .../java/com/android/internal/telephony/IMms.aidl  |  0
 4 files changed, 26 insertions(+)
 create mode 100644 mms/OWNERS
 rename {telephony => mms}/java/android/telephony/MmsManager.java (100%)
 rename {telephony => mms}/java/com/android/internal/telephony/IMms.aidl (100%)

diff --git a/Android.bp b/Android.bp
index ccb5fc745abba..78503775ccea6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -190,6 +190,15 @@ filegroup {
     path: "telephony/common",
 }
 
+filegroup {
+    name: "framework-mms-sources",
+    srcs: [
+        "mms/java/**/*.java",
+        "mms/java/**/*.aidl",
+    ],
+    path: "mms/java",
+}
+
 filegroup {
     name: "framework-wifi-sources",
     srcs: [
@@ -214,6 +223,7 @@ filegroup {
         ":framework-mca-filterfw-sources",
         ":framework-mca-filterpacks-sources",
         ":framework-mime-sources",
+        ":framework-mms-sources",
         ":framework-opengl-sources",
         ":framework-rs-sources",
         ":framework-sax-sources",
@@ -276,6 +286,7 @@ java_defaults {
             "media/mca/effect/java",
             "media/mca/filterfw/java",
             "media/mca/filterpacks/java",
+            "mms/java",
             "opengl/java",
             "rs/java",
             "sax/java",
@@ -860,6 +871,7 @@ frameworks_base_subdirs = [
     "media/mca/filterfw/java",
     "media/mca/filterpacks/java",
     "drm/java",
+    "mms/java",
     "opengl/java",
     "sax/java",
     "telecomm/java",
diff --git a/mms/OWNERS b/mms/OWNERS
new file mode 100644
index 0000000000000..ba00d5d750106
--- /dev/null
+++ b/mms/OWNERS
@@ -0,0 +1,14 @@
+set noparent
+
+tgunn@google.com
+breadley@google.com
+hallliu@google.com
+rgreenwalt@google.com
+amitmahajan@google.com
+fionaxu@google.com
+jackyu@google.com
+jminjie@google.com
+satk@google.com
+shuoq@google.com
+refuhoo@google.com
+nazaninb@google.com
diff --git a/telephony/java/android/telephony/MmsManager.java b/mms/java/android/telephony/MmsManager.java
similarity index 100%
rename from telephony/java/android/telephony/MmsManager.java
rename to mms/java/android/telephony/MmsManager.java
diff --git a/telephony/java/com/android/internal/telephony/IMms.aidl b/mms/java/com/android/internal/telephony/IMms.aidl
similarity index 100%
rename from telephony/java/com/android/internal/telephony/IMms.aidl
rename to mms/java/com/android/internal/telephony/IMms.aidl