Snap for 8562061 from c691540b78b09df3daf3333e7692bea29cbaf486 to mainline-media-release
Change-Id: I16ede140cdfb4d886aa88f66dc03549487ffd242
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 @@
}
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());
}
