summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-10 06:58:16 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-10 06:58:16 +0000
commit8bcfca37476a13cab20328b035855854a55f6df2 (patch)
treea901e46de83844642c553f5dd009c536edb93da0
parent89379d0bf3963752b634c9bfeaf63addc55ed9ef (diff)
parentc691540b78b09df3daf3333e7692bea29cbaf486 (diff)
downloadims-android13-mainline-conscrypt-release.tar.gz
Snap for 8564071 from c691540b78b09df3daf3333e7692bea29cbaf486 to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release
Change-Id: Icb3be49c0a405f1f495aa37571c2a027a993bab3
-rw-r--r--rcs/presencepolling/AndroidManifest.xml1
-rw-r--r--rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java6
2 files changed, 4 insertions, 3 deletions
diff --git a/rcs/presencepolling/AndroidManifest.xml b/rcs/presencepolling/AndroidManifest.xml
index 2ffcc5c..2e70d03 100644
--- a/rcs/presencepolling/AndroidManifest.xml
+++ b/rcs/presencepolling/AndroidManifest.xml
@@ -42,6 +42,7 @@
<protected-broadcast android:name="android.provider.rcs.eab.EAB_DATABASE_RESET"/>
<protected-broadcast android:name="com.android.service.ims.presence.capability_polling_retry"/>
<protected-broadcast android:name="com.android.service.ims.presence.periodical_capability_discovery"/>
+ <protected-broadcast android:name="com.android.vmm.DEVICE_STORAGE_FULL"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.BROADCAST_STICKY"/>
diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
index d39952f..da4cbd6 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
@@ -124,9 +124,9 @@ public class RcsSettingUtils {
}
try {
ProvisioningManager manager = ProvisioningManager.createForSubscriptionId(subId);
- isProvisioned = manager.getProvisioningIntValue(
- ProvisioningManager.KEY_EAB_PROVISIONING_STATUS)
- == ProvisioningManager.PROVISIONING_VALUE_ENABLED;
+ isProvisioned = manager.getRcsProvisioningStatusForCapability(
+ ImsRcsManager.CAPABILITY_TYPE_PRESENCE_UCE,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
} catch (Exception e) {
logger.debug("isEabProvisioned: exception=" + e.getMessage());
}