Merge "Improve correlation between log id in RILJ log and token id in modem log"android-o-mr1-iot-preview-8o-mr1-iot-preview-8

1 files changed, 7 insertions, 6 deletions

diff --git a/src/java/com/android/internal/telephony/RILRequest.java b/src/java/com/android/internal/telephony/RILRequest.java
index c0a0b70d78..d20ce22a4a 100644
--- a/src/java/com/android/internal/telephony/RILRequest.java
+++ b/src/java/com/android/internal/telephony/RILRequest.java
@@ -86,7 +86,8 @@ public class RILRequest {
             rr = new RILRequest();
         }
 
-        rr.mSerial = sNextSerial.getAndIncrement();
+        // Increment serial number. Wrap to 0 when reaching Integer.MAX_VALUE.
+        rr.mSerial = sNextSerial.getAndUpdate(n -> ((n + 1) % Integer.MAX_VALUE));
 
         rr.mRequest = request;
         rr.mResult = result;
@@ -151,9 +152,9 @@ public class RILRequest {
     }
 
     static void resetSerial() {
-        // use a random so that on recovery we probably don't mix old requests
+        // Use a non-negative random number so that on recovery we probably don't mix old requests
         // with new.
-        sNextSerial.set(sRandom.nextInt());
+        sNextSerial.set(sRandom.nextInt(Integer.MAX_VALUE));
     }
 
     String serialString() {
@@ -161,9 +162,9 @@ public class RILRequest {
         StringBuilder sb = new StringBuilder(8);
         String sn;
 
-        long adjustedSerial = (((long) mSerial) - Integer.MIN_VALUE) % 10000;
-
-        sn = Long.toString(adjustedSerial);
+        // Truncate mSerial to a number with maximum 4 digits.
+        int adjustedSerial = mSerial % 10000;
+        sn = Integer.toString(adjustedSerial);
 
         //sb.append("J[");
         sb.append('[');