Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a8dc74c authored by Allen Su's avatar Allen Su Committed by Automerger Merge Worker
Browse files

Merge "[RCS]Add OMA cpm filetransfer feature tag" into sc-dev am: ab28cf73... 

Merge "[RCS]Add OMA cpm filetransfer feature tag" into sc-dev am: ab28cf73 am: f7c41cdc am: cbeb81de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782671

Change-Id: I22421c898bbe5fde21884c51df9964f999d8a857
parents 1520359a cbeb81de

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4346,7 +4346,7 @@ public class CarrierConfigManager { 
                    "+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.deferred\"",

                    "+g.gsma.rcs.cpm.pager-large",

                    "+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.session\"",

                    "+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.session\"",

                    "+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.filetransfer\"",

                    "+g.3gpp.iari-ref=\"urn%3Aurn-7%3A3gpp-application.ims.iari.rcs.fthttp\"",

                    "+g.3gpp.iari-ref=\"urn%3Aurn-7%3A3gpp-application.ims.iari.rcs.ftsms\"",

                    "+g.3gpp.iari-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.gsma.callcomposer\"",