Snap for 8992082 from a1dfd835f7c99a46b1180805fa190b1c918caa79 to gki13-boot-releasegki13-boot-release

Change-Id: Id058bc0c1f146b1ff58d42bdb3826d414d3af60f

7 files changed, 16 insertions, 8 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/presencepolling/src/com/android/service/ims/presence/EABContactManager.java b/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
index 8ba2967..2b589ad 100644
--- a/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
+++ b/rcs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
@@ -47,6 +47,7 @@ import com.android.ims.RcsPresenceInfo;
 import com.android.ims.internal.Logger;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class EABContactManager {
@@ -625,7 +626,7 @@ public class EABContactManager {
             StringBuilder sb = new StringBuilder(512);
             sb.append("EABContactManager.Query { ");
             sb.append("\nSelection: " + selection);
-            sb.append("\nSelectionArgs: " + selectionArgs);
+            sb.append("\nSelectionArgs: " + Arrays.toString(selectionArgs));
             sb.append("\nOrderBy: " + orderBy);
             sb.append(" }");
             return sb.toString();
diff --git a/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java b/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java
index dac1401..710c046 100644
--- a/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java
+++ b/rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java
@@ -36,6 +36,7 @@ import android.telephony.ims.RcsContactUceCapability.PresenceBuilder;
 
 import java.lang.String;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.android.ims.internal.Logger;
 import com.android.ims.internal.uce.presence.PresTupleInfo;
@@ -59,7 +60,7 @@ public class PresenceInfoParser{
     static public RcsPresenceInfo getPresenceInfoFromTuple(String pPresentityURI,
             PresTupleInfo[] pTupleInfo){
         logger.debug("getPresenceInfoFromTuple: pPresentityURI=" + pPresentityURI +
-                " pTupleInfo=" + pTupleInfo);
+                " pTupleInfo=" + Arrays.toString(pTupleInfo));
 
         if(pPresentityURI == null){
             logger.error("pPresentityURI=" + pPresentityURI);
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());
         }
diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
index e279c83..6cc32f0 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
@@ -62,6 +62,8 @@ import com.android.service.ims.presence.PresenceBase;
 import com.android.service.ims.presence.PresencePublisher;
 import com.android.service.ims.presence.SubscribePublisher;
 
+import java.util.Arrays;
+
 public class RcsStackAdaptor implements PresencePublisher, SubscribePublisher {
     private static final boolean DEBUG = true;
 
@@ -309,7 +311,7 @@ public class RcsStackAdaptor implements PresencePublisher, SubscribePublisher {
 
     @Override
     public int requestCapability(String[] formattedContacts, int taskId) {
-        logger.print("requestCapability formattedContacts=" + formattedContacts);
+        logger.print("requestCapability formattedContacts=" + Arrays.toString(formattedContacts));
 
         int ret = ResultCode.SUCCESS;
         try {
diff --git a/rcs/rcsservice/src/com/android/service/ims/StackListener.java b/rcs/rcsservice/src/com/android/service/ims/StackListener.java
index 7edf080..649a66b 100644
--- a/rcs/rcsservice/src/com/android/service/ims/StackListener.java
+++ b/rcs/rcsservice/src/com/android/service/ims/StackListener.java
@@ -56,6 +56,7 @@ import com.android.service.ims.presence.PresencePublication;
 import com.android.service.ims.presence.PresenceSubscriber;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 public class StackListener extends Handler{
     /*
@@ -436,7 +437,7 @@ public class StackListener extends Handler{
         public void listCapInfoReceived(PresRlmiInfo pRlmiInfo, PresResInfo[] pResInfo)
                 throws RemoteException {
             if(pRlmiInfo == null || pResInfo == null){
-                logger.error("pRlmiInfo=" + pRlmiInfo + " pResInfo=" + pResInfo);
+                logger.error("pRlmiInfo=" + pRlmiInfo + " pResInfo=" + Arrays.toString(pResInfo));
             }else{
                 logger.debug("pRlmiInfo.getListName "+pRlmiInfo.getListName());
                 logger.debug("pRlmiInfo.isFullState "+pRlmiInfo.isFullState());
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java
index 6a82d6b..fd39c93 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java
@@ -40,6 +40,7 @@ import com.android.service.ims.TaskManager;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
 
 public class PresenceBase {
     static private Logger logger = Logger.getLogger("PresenceBase");
@@ -193,7 +194,8 @@ public class PresenceBase {
     protected boolean isInConfigList(int errorNo, String phrase, String[] errorArray) {
         String inErrorString = ("" + errorNo).trim();
 
-        logger.debug("errorArray length=" + errorArray.length + " errorArray=" + errorArray);
+        logger.debug("errorArray length=" + errorArray.length
+                + " errorArray=" + Arrays.toString(errorArray));
         for (String errorStr : errorArray) {
             if (errorStr != null && errorStr.startsWith(inErrorString)) {
                 String errorPhrase = errorStr.substring(inErrorString.length());