From ac0fd65067f267834081c6c7b19f30992125e35e Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Mon, 23 Sep 2019 17:59:57 -0700
Subject: [PATCH] Create frameworks/base/telephony/common for common
 non-mainline telephony code.

And move mms util code to the new folder.

Test: basic sanity
Bug: 140763963
Merged-in: I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22
Change-Id: I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22
(cherry picked from commit d355153dcbc125b80113c31dafc80afe1a5fddd6)
---
 Android.bp                                             | 10 ++++++++++
 CleanSpec.mk                                           |  1 +
 .../com/google/android/mms/ContentType.java            |  0
 .../android/mms/InvalidHeaderValueException.java       |  0
 .../com/google/android/mms/MmsException.java           |  0
 .../com/google/android/mms/package.html                |  0
 .../com/google/android/mms/pdu/AcknowledgeInd.java     |  0
 .../com/google/android/mms/pdu/Base64.java             |  0
 .../com/google/android/mms/pdu/CharacterSets.java      |  0
 .../com/google/android/mms/pdu/DeliveryInd.java        |  0
 .../com/google/android/mms/pdu/EncodedStringValue.java |  0
 .../com/google/android/mms/pdu/GenericPdu.java         |  0
 .../google/android/mms/pdu/MultimediaMessagePdu.java   |  0
 .../com/google/android/mms/pdu/NotificationInd.java    |  0
 .../com/google/android/mms/pdu/NotifyRespInd.java      |  0
 .../com/google/android/mms/pdu/PduBody.java            |  0
 .../com/google/android/mms/pdu/PduComposer.java        |  0
 .../com/google/android/mms/pdu/PduContentTypes.java    |  0
 .../com/google/android/mms/pdu/PduHeaders.java         |  0
 .../com/google/android/mms/pdu/PduParser.java          |  0
 .../com/google/android/mms/pdu/PduPart.java            |  0
 .../com/google/android/mms/pdu/PduPersister.java       |  0
 .../com/google/android/mms/pdu/QuotedPrintable.java    |  0
 .../com/google/android/mms/pdu/ReadOrigInd.java        |  0
 .../com/google/android/mms/pdu/ReadRecInd.java         |  0
 .../com/google/android/mms/pdu/RetrieveConf.java       |  0
 .../com/google/android/mms/pdu/SendConf.java           |  0
 .../com/google/android/mms/pdu/SendReq.java            |  0
 .../com/google/android/mms/pdu/package.html            |  0
 .../com/google/android/mms/util/AbstractCache.java     |  0
 .../com/google/android/mms/util/DownloadDrmHelper.java |  0
 .../com/google/android/mms/util/DrmConvertSession.java |  0
 .../com/google/android/mms/util/PduCache.java          |  0
 .../com/google/android/mms/util/PduCacheEntry.java     |  0
 .../com/google/android/mms/util/SqliteWrapper.java     |  0
 .../com/google/android/mms/util/package.html           |  0
 36 files changed, 11 insertions(+)
 rename telephony/{java => common}/com/google/android/mms/ContentType.java (100%)
 rename telephony/{java => common}/com/google/android/mms/InvalidHeaderValueException.java (100%)
 rename telephony/{java => common}/com/google/android/mms/MmsException.java (100%)
 rename telephony/{java => common}/com/google/android/mms/package.html (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/AcknowledgeInd.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/Base64.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/CharacterSets.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/DeliveryInd.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/EncodedStringValue.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/GenericPdu.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/MultimediaMessagePdu.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/NotificationInd.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/NotifyRespInd.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduBody.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduComposer.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduContentTypes.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduHeaders.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduParser.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduPart.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/PduPersister.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/QuotedPrintable.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/ReadOrigInd.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/ReadRecInd.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/RetrieveConf.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/SendConf.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/SendReq.java (100%)
 rename telephony/{java => common}/com/google/android/mms/pdu/package.html (100%)
 rename telephony/{java => common}/com/google/android/mms/util/AbstractCache.java (100%)
 rename telephony/{java => common}/com/google/android/mms/util/DownloadDrmHelper.java (100%)
 rename telephony/{java => common}/com/google/android/mms/util/DrmConvertSession.java (100%)
 rename telephony/{java => common}/com/google/android/mms/util/PduCache.java (100%)
 rename telephony/{java => common}/com/google/android/mms/util/PduCacheEntry.java (100%)
 rename telephony/{java => common}/com/google/android/mms/util/SqliteWrapper.java (100%)
 rename telephony/{java => common}/com/google/android/mms/util/package.html (100%)

diff --git a/Android.bp b/Android.bp
index 90dca0350a0ca..878fc3d1f56fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -161,6 +161,14 @@ filegroup {
     path: "telephony/java",
 }
 
+filegroup {
+    name: "framework-telephony-common-sources",
+    srcs: [
+        "telephony/common/**/*.java",
+    ],
+    path: "telephony/common",
+}
+
 filegroup {
     name: "framework-wifi-sources",
     srcs: [
@@ -189,6 +197,7 @@ filegroup {
         ":framework-rs-sources",
         ":framework-sax-sources",
         ":framework-telecomm-sources",
+        ":framework-telephony-common-sources",
         ":framework-telephony-sources",
         ":framework-wifi-sources",
         ":PacProcessor-aidl-sources",
@@ -833,6 +842,7 @@ frameworks_base_subdirs = [
     "opengl/java",
     "sax/java",
     "telecomm/java",
+    "telephony/common",
     "telephony/java",
     "wifi/java",
     "lowpan/java",
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6a909c0364e91..f7a2858351268 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -254,6 +254,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInsta
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerService)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/ext.jar)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/google/android/mms)
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
 # ******************************************************************
diff --git a/telephony/java/com/google/android/mms/ContentType.java b/telephony/common/com/google/android/mms/ContentType.java
similarity index 100%
rename from telephony/java/com/google/android/mms/ContentType.java
rename to telephony/common/com/google/android/mms/ContentType.java
diff --git a/telephony/java/com/google/android/mms/InvalidHeaderValueException.java b/telephony/common/com/google/android/mms/InvalidHeaderValueException.java
similarity index 100%
rename from telephony/java/com/google/android/mms/InvalidHeaderValueException.java
rename to telephony/common/com/google/android/mms/InvalidHeaderValueException.java
diff --git a/telephony/java/com/google/android/mms/MmsException.java b/telephony/common/com/google/android/mms/MmsException.java
similarity index 100%
rename from telephony/java/com/google/android/mms/MmsException.java
rename to telephony/common/com/google/android/mms/MmsException.java
diff --git a/telephony/java/com/google/android/mms/package.html b/telephony/common/com/google/android/mms/package.html
similarity index 100%
rename from telephony/java/com/google/android/mms/package.html
rename to telephony/common/com/google/android/mms/package.html
diff --git a/telephony/java/com/google/android/mms/pdu/AcknowledgeInd.java b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/AcknowledgeInd.java
rename to telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java
diff --git a/telephony/java/com/google/android/mms/pdu/Base64.java b/telephony/common/com/google/android/mms/pdu/Base64.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/Base64.java
rename to telephony/common/com/google/android/mms/pdu/Base64.java
diff --git a/telephony/java/com/google/android/mms/pdu/CharacterSets.java b/telephony/common/com/google/android/mms/pdu/CharacterSets.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/CharacterSets.java
rename to telephony/common/com/google/android/mms/pdu/CharacterSets.java
diff --git a/telephony/java/com/google/android/mms/pdu/DeliveryInd.java b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/DeliveryInd.java
rename to telephony/common/com/google/android/mms/pdu/DeliveryInd.java
diff --git a/telephony/java/com/google/android/mms/pdu/EncodedStringValue.java b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/EncodedStringValue.java
rename to telephony/common/com/google/android/mms/pdu/EncodedStringValue.java
diff --git a/telephony/java/com/google/android/mms/pdu/GenericPdu.java b/telephony/common/com/google/android/mms/pdu/GenericPdu.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/GenericPdu.java
rename to telephony/common/com/google/android/mms/pdu/GenericPdu.java
diff --git a/telephony/java/com/google/android/mms/pdu/MultimediaMessagePdu.java b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/MultimediaMessagePdu.java
rename to telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java
diff --git a/telephony/java/com/google/android/mms/pdu/NotificationInd.java b/telephony/common/com/google/android/mms/pdu/NotificationInd.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/NotificationInd.java
rename to telephony/common/com/google/android/mms/pdu/NotificationInd.java
diff --git a/telephony/java/com/google/android/mms/pdu/NotifyRespInd.java b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/NotifyRespInd.java
rename to telephony/common/com/google/android/mms/pdu/NotifyRespInd.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduBody.java b/telephony/common/com/google/android/mms/pdu/PduBody.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduBody.java
rename to telephony/common/com/google/android/mms/pdu/PduBody.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduComposer.java b/telephony/common/com/google/android/mms/pdu/PduComposer.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduComposer.java
rename to telephony/common/com/google/android/mms/pdu/PduComposer.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduContentTypes.java b/telephony/common/com/google/android/mms/pdu/PduContentTypes.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduContentTypes.java
rename to telephony/common/com/google/android/mms/pdu/PduContentTypes.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduHeaders.java b/telephony/common/com/google/android/mms/pdu/PduHeaders.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduHeaders.java
rename to telephony/common/com/google/android/mms/pdu/PduHeaders.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduParser.java b/telephony/common/com/google/android/mms/pdu/PduParser.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduParser.java
rename to telephony/common/com/google/android/mms/pdu/PduParser.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduPart.java b/telephony/common/com/google/android/mms/pdu/PduPart.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduPart.java
rename to telephony/common/com/google/android/mms/pdu/PduPart.java
diff --git a/telephony/java/com/google/android/mms/pdu/PduPersister.java b/telephony/common/com/google/android/mms/pdu/PduPersister.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/PduPersister.java
rename to telephony/common/com/google/android/mms/pdu/PduPersister.java
diff --git a/telephony/java/com/google/android/mms/pdu/QuotedPrintable.java b/telephony/common/com/google/android/mms/pdu/QuotedPrintable.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/QuotedPrintable.java
rename to telephony/common/com/google/android/mms/pdu/QuotedPrintable.java
diff --git a/telephony/java/com/google/android/mms/pdu/ReadOrigInd.java b/telephony/common/com/google/android/mms/pdu/ReadOrigInd.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/ReadOrigInd.java
rename to telephony/common/com/google/android/mms/pdu/ReadOrigInd.java
diff --git a/telephony/java/com/google/android/mms/pdu/ReadRecInd.java b/telephony/common/com/google/android/mms/pdu/ReadRecInd.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/ReadRecInd.java
rename to telephony/common/com/google/android/mms/pdu/ReadRecInd.java
diff --git a/telephony/java/com/google/android/mms/pdu/RetrieveConf.java b/telephony/common/com/google/android/mms/pdu/RetrieveConf.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/RetrieveConf.java
rename to telephony/common/com/google/android/mms/pdu/RetrieveConf.java
diff --git a/telephony/java/com/google/android/mms/pdu/SendConf.java b/telephony/common/com/google/android/mms/pdu/SendConf.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/SendConf.java
rename to telephony/common/com/google/android/mms/pdu/SendConf.java
diff --git a/telephony/java/com/google/android/mms/pdu/SendReq.java b/telephony/common/com/google/android/mms/pdu/SendReq.java
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/SendReq.java
rename to telephony/common/com/google/android/mms/pdu/SendReq.java
diff --git a/telephony/java/com/google/android/mms/pdu/package.html b/telephony/common/com/google/android/mms/pdu/package.html
similarity index 100%
rename from telephony/java/com/google/android/mms/pdu/package.html
rename to telephony/common/com/google/android/mms/pdu/package.html
diff --git a/telephony/java/com/google/android/mms/util/AbstractCache.java b/telephony/common/com/google/android/mms/util/AbstractCache.java
similarity index 100%
rename from telephony/java/com/google/android/mms/util/AbstractCache.java
rename to telephony/common/com/google/android/mms/util/AbstractCache.java
diff --git a/telephony/java/com/google/android/mms/util/DownloadDrmHelper.java b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java
similarity index 100%
rename from telephony/java/com/google/android/mms/util/DownloadDrmHelper.java
rename to telephony/common/com/google/android/mms/util/DownloadDrmHelper.java
diff --git a/telephony/java/com/google/android/mms/util/DrmConvertSession.java b/telephony/common/com/google/android/mms/util/DrmConvertSession.java
similarity index 100%
rename from telephony/java/com/google/android/mms/util/DrmConvertSession.java
rename to telephony/common/com/google/android/mms/util/DrmConvertSession.java
diff --git a/telephony/java/com/google/android/mms/util/PduCache.java b/telephony/common/com/google/android/mms/util/PduCache.java
similarity index 100%
rename from telephony/java/com/google/android/mms/util/PduCache.java
rename to telephony/common/com/google/android/mms/util/PduCache.java
diff --git a/telephony/java/com/google/android/mms/util/PduCacheEntry.java b/telephony/common/com/google/android/mms/util/PduCacheEntry.java
similarity index 100%
rename from telephony/java/com/google/android/mms/util/PduCacheEntry.java
rename to telephony/common/com/google/android/mms/util/PduCacheEntry.java
diff --git a/telephony/java/com/google/android/mms/util/SqliteWrapper.java b/telephony/common/com/google/android/mms/util/SqliteWrapper.java
similarity index 100%
rename from telephony/java/com/google/android/mms/util/SqliteWrapper.java
rename to telephony/common/com/google/android/mms/util/SqliteWrapper.java
diff --git a/telephony/java/com/google/android/mms/util/package.html b/telephony/common/com/google/android/mms/util/package.html
similarity index 100%
rename from telephony/java/com/google/android/mms/util/package.html
rename to telephony/common/com/google/android/mms/util/package.html
-- 
GitLab