diff options
2 files changed, 10 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubServiceTransaction.java b/services/core/java/com/android/server/location/contexthub/ContextHubServiceTransaction.java index 2ec9bdb75349..3aea6d533295 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubServiceTransaction.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubServiceTransaction.java @@ -33,11 +33,11 @@ abstract class ContextHubServiceTransaction { @ContextHubTransaction.Type private final int mTransactionType; - private final Long mNanoAppId; + private final long mNanoAppId; private final String mPackage; - private final Integer mMessageSequenceNumber; + private final int mMessageSequenceNumber; private long mNextRetryTime; @@ -53,9 +53,9 @@ abstract class ContextHubServiceTransaction { ContextHubServiceTransaction(int id, int type, String packageName) { mTransactionId = id; mTransactionType = type; - mNanoAppId = null; + mNanoAppId = Long.MAX_VALUE; mPackage = packageName; - mMessageSequenceNumber = null; + mMessageSequenceNumber = Integer.MAX_VALUE; mNextRetryTime = Long.MAX_VALUE; mTimeoutTime = Long.MAX_VALUE; mNumCompletedStartCalls = 0; @@ -68,7 +68,7 @@ abstract class ContextHubServiceTransaction { mTransactionType = type; mNanoAppId = nanoAppId; mPackage = packageName; - mMessageSequenceNumber = null; + mMessageSequenceNumber = Integer.MAX_VALUE; mNextRetryTime = Long.MAX_VALUE; mTimeoutTime = Long.MAX_VALUE; mNumCompletedStartCalls = 0; @@ -79,7 +79,7 @@ abstract class ContextHubServiceTransaction { int messageSequenceNumber, short hostEndpointId) { mTransactionId = id; mTransactionType = type; - mNanoAppId = null; + mNanoAppId = Long.MAX_VALUE; mPackage = packageName; mMessageSequenceNumber = messageSequenceNumber; mNextRetryTime = Long.MAX_VALUE; @@ -131,7 +131,7 @@ abstract class ContextHubServiceTransaction { return mTransactionType; } - Integer getMessageSequenceNumber() { + int getMessageSequenceNumber() { return mMessageSequenceNumber; } @@ -204,14 +204,14 @@ abstract class ContextHubServiceTransaction { out.append(ContextHubTransaction.typeToString(mTransactionType, /* upperCase= */ true)); out.append(" ("); - if (mNanoAppId != null) { + if (mNanoAppId != Long.MAX_VALUE) { out.append("appId = 0x"); out.append(Long.toHexString(mNanoAppId)); out.append(", "); } out.append("package = "); out.append(mPackage); - if (mMessageSequenceNumber != null) { + if (mMessageSequenceNumber != Integer.MAX_VALUE) { out.append(", messageSequenceNumber = "); out.append(mMessageSequenceNumber); } diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubTransactionManager.java b/services/core/java/com/android/server/location/contexthub/ContextHubTransactionManager.java index 1a449e024ee1..fd82d4c1cf4f 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubTransactionManager.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubTransactionManager.java @@ -474,9 +474,8 @@ import java.util.concurrent.atomic.AtomicInteger; return; } - Integer transactionMessageSequenceNumber = transaction.getMessageSequenceNumber(); + int transactionMessageSequenceNumber = transaction.getMessageSequenceNumber(); if (transaction.getTransactionType() != ContextHubTransaction.TYPE_RELIABLE_MESSAGE - || transactionMessageSequenceNumber == null || transactionMessageSequenceNumber != messageSequenceNumber) { Log.w(TAG, "Received unexpected message transaction response (expected message " + "sequence number = " |