commit 8fd53febf2e897065a4eb236d82e4c19899d6b30
author Xin Li <delphij@google.com> Mon Aug 15 22:02:37 2022 -0700
committer Xin Li <delphij@google.com> Mon Aug 15 22:02:37 2022 -0700
tree a901e46de83844642c553f5dd009c536edb93da0
parent 5b37f3e3c0c8f06725aabef013f2b6b961085d83
parent fa2df575335b8fe08bf8f40ae618773bb2473186

DO NOT MERGE - Merge Android 13

Bug: 242648940
Merged-In: I646675a4b0454c6c3038f4cc70b380072e063e7c
Change-Id: I1b08ccb1fd30553b440a7b1eac8dbddfebcebdee

rcs/presencepolling/AndroidManifest.xml

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"/>

rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java

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());
         }