Messaging: Rename androidx.appcompat.mms

* Someone apparently decided to "Replace-In-Files" these before, but they are not correct according to the folder structure * Since it is just annoying to read the code in AS when it does not match the folder, change the package name back Change-Id: Iea5c51aeb9e1f5b650a1009348065c7c38cddbeb
2024-12-14 14:48:39 +01:00
parent 009df43b06
commit a65de2aee3
53 changed files with 108 additions and 59 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -530,7 +530,7 @@
            </intent-filter>
        </activity>

-        <service android:name="androidx.appcompat.mms.MmsService"/>
+        <service android:name="android.support.v7.mms.MmsService"/>
    </application>

 </manifest>
--- a/src/android/support/v7/mms/ApnException.java
+++ b/src/android/support/v7/mms/ApnException.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 /**
 * APN exception
--- a/src/android/support/v7/mms/ApnSettingsLoader.java
+++ b/src/android/support/v7/mms/ApnSettingsLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import java.util.List;

--- a/src/android/support/v7/mms/ApnsXmlParser.java
+++ b/src/android/support/v7/mms/ApnsXmlParser.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.ContentValues;

--- a/src/android/support/v7/mms/CarrierConfigValuesLoader.java
+++ b/src/android/support/v7/mms/CarrierConfigValuesLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.os.Bundle;

--- a/src/android/support/v7/mms/CarrierConfigXmlParser.java
+++ b/src/android/support/v7/mms/CarrierConfigXmlParser.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
--- a/src/android/support/v7/mms/DefaultApnSettingsLoader.java
+++ b/src/android/support/v7/mms/DefaultApnSettingsLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.ContentValues;
 import android.content.Context;
--- a/src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java
+++ b/src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.Context;
 import android.content.res.Resources;
--- a/src/android/support/v7/mms/DefaultUserAgentInfoLoader.java
+++ b/src/android/support/v7/mms/DefaultUserAgentInfoLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.Context;
 import android.telephony.TelephonyManager;
--- a/src/android/support/v7/mms/DownloadRequest.java
+++ b/src/android/support/v7/mms/DownloadRequest.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.app.PendingIntent;
 import android.content.ContentResolver;
--- a/src/android/support/v7/mms/MmsHttpClient.java
+++ b/src/android/support/v7/mms/MmsHttpClient.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.Context;
 import android.os.Bundle;
--- a/src/android/support/v7/mms/MmsHttpException.java
+++ b/src/android/support/v7/mms/MmsHttpException.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 /**
 * HTTP exception
--- a/src/android/support/v7/mms/MmsManager.java
+++ b/src/android/support/v7/mms/MmsManager.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.app.PendingIntent;
 import android.content.Context;
--- a/src/android/support/v7/mms/MmsNetworkException.java
+++ b/src/android/support/v7/mms/MmsNetworkException.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 /**
 * MMS network exception
--- a/src/android/support/v7/mms/MmsNetworkManager.java
+++ b/src/android/support/v7/mms/MmsNetworkManager.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.BroadcastReceiver;
 import android.content.Context;
--- a/src/android/support/v7/mms/MmsRequest.java
+++ b/src/android/support/v7/mms/MmsRequest.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.app.Activity;
 import android.app.PendingIntent;
@@ -25,10 +26,10 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.appcompat.mms.pdu.GenericPdu;
-import androidx.appcompat.mms.pdu.PduHeaders;
-import androidx.appcompat.mms.pdu.PduParser;
-import androidx.appcompat.mms.pdu.SendConf;
+import android.support.v7.mms.pdu.GenericPdu;
+import android.support.v7.mms.pdu.PduHeaders;
+import android.support.v7.mms.pdu.PduParser;
+import android.support.v7.mms.pdu.SendConf;
 import android.telephony.SmsManager;
 import android.text.TextUtils;
 import android.util.Log;
--- a/src/android/support/v7/mms/MmsService.java
+++ b/src/android/support/v7/mms/MmsService.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.app.Service;
 import android.content.Context;
--- a/src/android/support/v7/mms/MmsXmlResourceParser.java
+++ b/src/android/support/v7/mms/MmsXmlResourceParser.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.util.Log;

--- a/src/android/support/v7/mms/PhoneNumberHelper.java
+++ b/src/android/support/v7/mms/PhoneNumberHelper.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.text.TextUtils;
 import android.util.Log;
--- a/src/android/support/v7/mms/SendRequest.java
+++ b/src/android/support/v7/mms/SendRequest.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.app.PendingIntent;
 import android.content.ContentResolver;
--- a/src/android/support/v7/mms/UserAgentInfoLoader.java
+++ b/src/android/support/v7/mms/UserAgentInfoLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 /**
 * Interface to load UserAgent and UA Prof URL
--- a/src/android/support/v7/mms/Utils.java
+++ b/src/android/support/v7/mms/Utils.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms;
+package android.support.v7.mms;

 import android.content.Context;
 import android.content.res.Configuration;
--- a/src/android/support/v7/mms/pdu/AcknowledgeInd.java
+++ b/src/android/support/v7/mms/pdu/AcknowledgeInd.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * M-Acknowledge.ind PDU.
--- a/src/android/support/v7/mms/pdu/Base64.java
+++ b/src/android/support/v7/mms/pdu/Base64.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 public class Base64 {
    /**
--- a/src/android/support/v7/mms/pdu/CharacterSets.java
+++ b/src/android/support/v7/mms/pdu/CharacterSets.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
--- a/src/android/support/v7/mms/pdu/ContentType.java
+++ b/src/android/support/v7/mms/pdu/ContentType.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007-2008 Esmertec AG.
 * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import java.util.ArrayList;

--- a/src/android/support/v7/mms/pdu/DeliveryInd.java
+++ b/src/android/support/v7/mms/pdu/DeliveryInd.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * M-Delivery.Ind Pdu.
--- a/src/android/support/v7/mms/pdu/EncodedStringValue.java
+++ b/src/android/support/v7/mms/pdu/EncodedStringValue.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007-2008 Esmertec AG.
 * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import android.util.Log;

--- a/src/android/support/v7/mms/pdu/GenericPdu.java
+++ b/src/android/support/v7/mms/pdu/GenericPdu.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 public class GenericPdu {
    /**
--- a/src/android/support/v7/mms/pdu/InvalidHeaderValueException.java
+++ b/src/android/support/v7/mms/pdu/InvalidHeaderValueException.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * Thrown when an invalid header value was set.
--- a/src/android/support/v7/mms/pdu/MmsException.java
+++ b/src/android/support/v7/mms/pdu/MmsException.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * A generic exception that is thrown by the Mms client.
--- a/src/android/support/v7/mms/pdu/MultimediaMessagePdu.java
+++ b/src/android/support/v7/mms/pdu/MultimediaMessagePdu.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * Multimedia message PDU.
--- a/src/android/support/v7/mms/pdu/NotificationInd.java
+++ b/src/android/support/v7/mms/pdu/NotificationInd.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * M-Notification.ind PDU.
--- a/src/android/support/v7/mms/pdu/NotifyRespInd.java
+++ b/src/android/support/v7/mms/pdu/NotifyRespInd.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * M-NofifyResp.ind PDU.
--- a/src/android/support/v7/mms/pdu/PduBody.java
+++ b/src/android/support/v7/mms/pdu/PduBody.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import java.util.HashMap;
 import java.util.Map;
--- a/src/android/support/v7/mms/pdu/PduContentTypes.java
+++ b/src/android/support/v7/mms/pdu/PduContentTypes.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 public class PduContentTypes {
    /**
--- a/src/android/support/v7/mms/pdu/PduHeaders.java
+++ b/src/android/support/v7/mms/pdu/PduHeaders.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import java.util.ArrayList;
 import java.util.HashMap;
--- a/src/android/support/v7/mms/pdu/PduParser.java
+++ b/src/android/support/v7/mms/pdu/PduParser.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007-2008 Esmertec AG.
 * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import android.util.Log;

--- a/src/android/support/v7/mms/pdu/PduPart.java
+++ b/src/android/support/v7/mms/pdu/PduPart.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007-2008 Esmertec AG.
 * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import android.net.Uri;

--- a/src/android/support/v7/mms/pdu/QuotedPrintable.java
+++ b/src/android/support/v7/mms/pdu/QuotedPrintable.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import java.io.ByteArrayOutputStream;

--- a/src/android/support/v7/mms/pdu/ReadOrigInd.java
+++ b/src/android/support/v7/mms/pdu/ReadOrigInd.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 public class ReadOrigInd extends GenericPdu {
    /**
--- a/src/android/support/v7/mms/pdu/ReadRecInd.java
+++ b/src/android/support/v7/mms/pdu/ReadRecInd.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 public class ReadRecInd extends GenericPdu {
    /**
--- a/src/android/support/v7/mms/pdu/RetrieveConf.java
+++ b/src/android/support/v7/mms/pdu/RetrieveConf.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 /**
 * M-Retrive.conf Pdu.
--- a/src/android/support/v7/mms/pdu/SendConf.java
+++ b/src/android/support/v7/mms/pdu/SendConf.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007 Esmertec AG.
 * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 public class SendConf extends GenericPdu {
    /**
--- a/src/android/support/v7/mms/pdu/SendReq.java
+++ b/src/android/support/v7/mms/pdu/SendReq.java
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2007-2008 Esmertec AG.
 * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 * limitations under the License.
 */

-package androidx.appcompat.mms.pdu;
+package android.support.v7.mms.pdu;

 import android.util.Log;

--- a/src/com/android/messaging/BugleApplication.java
+++ b/src/com/android/messaging/BugleApplication.java
@@ -25,8 +25,8 @@ import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.appcompat.mms.CarrierConfigValuesLoader;
-import androidx.appcompat.mms.MmsManager;
+import android.support.v7.mms.CarrierConfigValuesLoader;
+import android.support.v7.mms.MmsManager;
 import android.telephony.CarrierConfigManager;

 import com.android.messaging.datamodel.DataModel;
--- a/src/com/android/messaging/datamodel/data/ParticipantData.java
+++ b/src/com/android/messaging/datamodel/data/ParticipantData.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@ import android.os.Parcelable;
 import android.telephony.SubscriptionInfo;
 import android.text.TextUtils;

-import androidx.appcompat.mms.MmsManager;
+import android.support.v7.mms.MmsManager;
 import androidx.collection.ArrayMap;

 import com.android.ex.chips.RecipientEntry;
--- a/src/com/android/messaging/sms/BugleApnSettingsLoader.java
+++ b/src/com/android/messaging/sms/BugleApnSettingsLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -23,8 +24,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.provider.Telephony;
-import androidx.appcompat.mms.ApnSettingsLoader;
-import androidx.appcompat.mms.MmsManager;
+import android.support.v7.mms.ApnSettingsLoader;
+import android.support.v7.mms.MmsManager;
 import android.text.TextUtils;
 import android.util.SparseArray;

--- a/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java
+++ b/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
-import androidx.appcompat.mms.CarrierConfigValuesLoader;
+import android.support.v7.mms.CarrierConfigValuesLoader;
 import android.util.SparseArray;

 import com.android.messaging.R;
--- a/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java
+++ b/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 package com.android.messaging.sms;

 import android.content.Context;
-import androidx.appcompat.mms.UserAgentInfoLoader;
+import android.support.v7.mms.UserAgentInfoLoader;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;

--- a/src/com/android/messaging/sms/MmsConfig.java
+++ b/src/com/android/messaging/sms/MmsConfig.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 package com.android.messaging.sms;

 import android.os.Bundle;
-import androidx.appcompat.mms.CarrierConfigValuesLoader;
+import android.support.v7.mms.CarrierConfigValuesLoader;
 import android.telephony.SubscriptionInfo;

 import com.android.messaging.Factory;
--- a/src/com/android/messaging/sms/MmsSender.java
+++ b/src/com/android/messaging/sms/MmsSender.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.appcompat.mms.MmsManager;
+import android.support.v7.mms.MmsManager;
 import android.telephony.SmsManager;

 import com.android.messaging.datamodel.MmsFileProvider;
--- a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
+++ b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
@@ -29,10 +29,10 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
+import android.support.v7.mms.MmsManager;
 import android.text.TextUtils;
 import android.view.MenuItem;

-import androidx.appcompat.mms.MmsManager;
 import androidx.core.app.NavUtils;

 import com.android.messaging.Factory;