From b46dd4a10c98b1cad76487e3d5f480b9e96c60e3 Mon Sep 17 00:00:00 2001 From: joonhunshin Date: Mon, 25 Apr 2022 01:11:04 +0000 Subject: Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned. Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned. Bug: 229793066 Test: atest ImsService Change-Id: I646675a4b0454c6c3038f4cc70b380072e063e7c --- rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rcs/rcsservice/src') 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()); } -- cgit v1.2.3 From a1dfd835f7c99a46b1180805fa190b1c918caa79 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 15 Aug 2022 15:03:04 -0700 Subject: Fix array-related errorprone warnings The ArrayEquals, ArrayHashCode, ArrayToString, and ArraysAsListPrimitiveArray errorprone findings were demoted from errors to warnings. Fix existing occurrences of them so they can be made errors again. Bug: 242630963 Test: RUN_ERROR_PRONE=true m javac-check Change-Id: I6ab1698ebe1150d8a8a226f3982556431216eab2 --- rcs/rcsservice/src/com/android/service/ims/PresenceInfoParser.java | 3 ++- rcs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java | 4 +++- rcs/rcsservice/src/com/android/service/ims/StackListener.java | 3 ++- rcs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'rcs/rcsservice/src') 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/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()); -- cgit v1.2.3 From 1a3d0d5bb846e8313bfe5219181afc8b1d1cfb21 Mon Sep 17 00:00:00 2001 From: Jongduck You Date: Thu, 18 Aug 2022 23:21:23 +0000 Subject: Add MODIFY_PHONE_STATE when registering receiver ACTION_TTY_PREFERRED_MODE_CHANGE cannot be converted to a protected-broadcast Prevent RcsService from receving the intent that sent from unpriviledged apps Bug: 235100180 Tests: Check Permission Denial of broadcasted intent Change-Id: I70727da0e2461512100ab9e35e382aff2f7f2de4 --- rcs/rcsservice/src/com/android/service/ims/RcsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rcs/rcsservice/src') diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsService.java b/rcs/rcsservice/src/com/android/service/ims/RcsService.java index 7d7b744..1823656 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsService.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsService.java @@ -248,7 +248,7 @@ public class RcsService extends Service { IntentFilter filter = new IntentFilter(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED); filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); filter.addAction(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED); - registerReceiver(mReceiver, filter); + registerReceiver(mReceiver, filter, android.Manifest.permission.MODIFY_PHONE_STATE, null); } private void unregisterBroadcastReceiver() { -- cgit v1.2.3 From dcc6d81c40310bd07b911c3506d7ae096b2cb42d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:31 -0700 Subject: Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: Ia3faefdefc558f005de72bc59260eccbc121674e --- .../src/com/android/service/ims/AlarmBroadcastReceiver.java | 3 +-- rcs/rcsservice/src/com/android/service/ims/StackListener.java | 4 ++-- rcs/rcsservice/src/com/android/service/ims/Task.java | 3 +-- .../com/android/service/ims/presence/PresenceAvailabilityTask.java | 3 +-- .../src/com/android/service/ims/presence/PresenceCapabilityTask.java | 2 +- .../src/com/android/service/ims/presence/PresencePublishTask.java | 3 +-- rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java | 3 +-- 7 files changed, 8 insertions(+), 13 deletions(-) (limited to 'rcs/rcsservice/src') diff --git a/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java b/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java index e06b4a4..9c06a5e 100644 --- a/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java +++ b/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java @@ -68,5 +68,4 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver{ logger.debug("not interest in intent=" + intent); } } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/StackListener.java b/rcs/rcsservice/src/com/android/service/ims/StackListener.java index 649a66b..a89f459 100644 --- a/rcs/rcsservice/src/com/android/service/ims/StackListener.java +++ b/rcs/rcsservice/src/com/android/service/ims/StackListener.java @@ -508,8 +508,8 @@ public class StackListener extends Handler{ public void capInfoReceived(String presentityURI, PresTupleInfo[] pTupleInfo) throws RemoteException { logger.debug("ListenerHandler : CapInfoReceived"); - if(presentityURI == null || presentityURI == null){ - logger.error("presentityURI=null or presentityURI=null"); + if(presentityURI == null) { + logger.error("presentityURI=null"); return; } diff --git a/rcs/rcsservice/src/com/android/service/ims/Task.java b/rcs/rcsservice/src/com/android/service/ims/Task.java index 61e85b4..ce4ef34 100644 --- a/rcs/rcsservice/src/com/android/service/ims/Task.java +++ b/rcs/rcsservice/src/com/android/service/ims/Task.java @@ -78,5 +78,4 @@ public class Task{ " mSipResponseCode=" + mSipResponseCode + " mSipReasonPhrase=" + mSipReasonPhrase; } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java index 08a5b32..6f53fa6 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java @@ -69,5 +69,4 @@ public class PresenceAvailabilityTask extends PresenceTask{ return super.toString() + " mNotifyTimeStamp=" + mNotifyTimeStamp; } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java index fb22b5e..f93b317 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java @@ -161,4 +161,4 @@ public class PresenceCapabilityTask extends PresenceTask{ TaskManager.getDefault().removeTask(mTaskId); } -}; +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java index 24d1ada..49bd1e2 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java @@ -61,5 +61,4 @@ public class PresencePublishTask extends PresenceTask{ " mCreateTimestamp=" + mCreateTimestamp + " mRetryCount=" + mRetryCount; } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java index 5465e10..1f24507 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java @@ -55,5 +55,4 @@ public class PresenceTask extends Task { " mSipResponseCode=" + mSipResponseCode + " mSipReasonPhrase=" + mSipReasonPhrase; } -}; - +} -- cgit v1.2.3