diff --git a/Android.bp b/Android.bp index d11c8c2..904b085 100644 --- a/Android.bp +++ b/Android.bp @@ -377,30 +377,6 @@ android_app_import { product_specific: true, } -android_app_import { - name: "SprintDM", - owner: "google", - apk: "proprietary/product/priv-app/SprintDM/SprintDM.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "SprintHM", - owner: "google", - apk: "proprietary/product/priv-app/SprintHM/SprintHM.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - android_app_import { name: "TetheringEntitlement", owner: "google", diff --git a/crosshatch-vendor.mk b/crosshatch-vendor.mk index 7fda1e7..f46c16b 100644 --- a/crosshatch-vendor.mk +++ b/crosshatch-vendor.mk @@ -44,7 +44,6 @@ PRODUCT_COPY_FILES += \ vendor/google/crosshatch/proprietary/product/etc/permissions/com.android.sdm.plugins.connmo.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.android.sdm.plugins.connmo.xml \ vendor/google/crosshatch/proprietary/product/etc/permissions/com.android.sdm.plugins.dcmo.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.android.sdm.plugins.dcmo.xml \ vendor/google/crosshatch/proprietary/product/etc/permissions/com.android.sdm.plugins.diagmon.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.android.sdm.plugins.diagmon.xml \ - vendor/google/crosshatch/proprietary/product/etc/permissions/com.android.sdm.plugins.sprintdm.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.android.sdm.plugins.sprintdm.xml \ vendor/google/crosshatch/proprietary/product/etc/permissions/com.android.sdm.plugins.usccdm.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.android.sdm.plugins.usccdm.xml \ vendor/google/crosshatch/proprietary/product/etc/permissions/com.google.android.hardwareinfo.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.hardwareinfo.xml \ vendor/google/crosshatch/proprietary/product/etc/permissions/com.google.omadm.trigger.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.omadm.trigger.xml \ @@ -197,8 +196,6 @@ PRODUCT_PACKAGES += \ HotwordEnrollmentOKGoogleWCD9340 \ HotwordEnrollmentXGoogleWCD9340 \ OemDmTrigger \ - SprintDM \ - SprintHM \ TetheringEntitlement \ USCCDM \ WfcActivation \ @@ -1503,8 +1500,6 @@ PRODUCT_COPY_FILES += \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/CSpire/VoLTE/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/CSpire/VoLTE/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Inland/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Inland/Commercial/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Rogers/Commercial/CA/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Rogers/Commercial/CA/mcfg_sw.mbn \ - vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/Commercial/mcfg_sw.mbn \ - vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/VoWiFi/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/VoWiFi/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/TMO/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/TMO/Commercial/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Telus/Commercial/CA/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Telus/Commercial/CA/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/USCC/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/USCC/Commercial/mcfg_sw.mbn \ @@ -1521,8 +1516,6 @@ PRODUCT_COPY_FILES += \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Lucky/Commercial/CA/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Lucky/Commercial/CA/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/MTS/Commercial/CA/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/MTS/Commercial/CA/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Solo_PC/Commercial/CA/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Solo_PC/Commercial/CA/mcfg_sw.mbn \ - vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI/Commercial/mcfg_sw.mbn \ - vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI_Data/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI_Data/Commercial/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/TMO_FI/Commercial/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/TMO_FI/Commercial/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/TbayCity/NonVoLTE/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/TbayCity/NonVoLTE/mcfg_sw.mbn \ vendor/google/crosshatch/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Telus/Lab/CA/mcfg_sw.mbn:$(TARGET_COPY_OUT_VENDOR)/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Telus/Lab/CA/mcfg_sw.mbn \ diff --git a/proprietary/product/etc/CarrierSettings/sprint_us.pb b/proprietary/product/etc/CarrierSettings/sprint_us.pb deleted file mode 100644 index 187c497..0000000 Binary files a/proprietary/product/etc/CarrierSettings/sprint_us.pb and /dev/null differ diff --git a/proprietary/product/etc/CarrierSettings/sprintprepaid_us.pb b/proprietary/product/etc/CarrierSettings/sprintprepaid_us.pb deleted file mode 100644 index 80a6521..0000000 Binary files a/proprietary/product/etc/CarrierSettings/sprintprepaid_us.pb and /dev/null differ diff --git a/proprietary/product/etc/CarrierSettings/sprintwholesale_us.pb b/proprietary/product/etc/CarrierSettings/sprintwholesale_us.pb deleted file mode 100644 index f25092c..0000000 Binary files a/proprietary/product/etc/CarrierSettings/sprintwholesale_us.pb and /dev/null differ diff --git a/proprietary/product/etc/permissions/com.android.sdm.plugins.sprintdm.xml b/proprietary/product/etc/permissions/com.android.sdm.plugins.sprintdm.xml deleted file mode 100644 index a44b112..0000000 --- a/proprietary/product/etc/permissions/com.android.sdm.plugins.sprintdm.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/proprietary/product/priv-app/SprintDM/SprintDM.apk b/proprietary/product/priv-app/SprintDM/SprintDM.apk deleted file mode 100644 index a5424ca..0000000 Binary files a/proprietary/product/priv-app/SprintDM/SprintDM.apk and /dev/null differ diff --git a/proprietary/product/priv-app/SprintHM/SprintHM.apk b/proprietary/product/priv-app/SprintHM/SprintHM.apk deleted file mode 100644 index e23a8b0..0000000 Binary files a/proprietary/product/priv-app/SprintHM/SprintHM.apk and /dev/null differ diff --git a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/Commercial/mcfg_sw.mbn b/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/Commercial/mcfg_sw.mbn deleted file mode 100644 index 3319690..0000000 Binary files a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/Commercial/mcfg_sw.mbn and /dev/null differ diff --git a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/VoWiFi/mcfg_sw.mbn b/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/VoWiFi/mcfg_sw.mbn deleted file mode 100644 index 0fd2d8c..0000000 Binary files a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/NA/Sprint/VoWiFi/mcfg_sw.mbn and /dev/null differ diff --git a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI/Commercial/mcfg_sw.mbn b/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI/Commercial/mcfg_sw.mbn deleted file mode 100644 index 2e5960a..0000000 Binary files a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI/Commercial/mcfg_sw.mbn and /dev/null differ diff --git a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI_Data/Commercial/mcfg_sw.mbn b/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI_Data/Commercial/mcfg_sw.mbn deleted file mode 100644 index dd2739c..0000000 Binary files a/proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/Pixel/NA/Sprint_FI_Data/Commercial/mcfg_sw.mbn and /dev/null differ