diff --git a/src/com/android/phone/common/CallLogAsync.java b/src/com/android/phone/common/CallLogAsync.java
index e8ed6b6..2e00195 100644
--- a/src/com/android/phone/common/CallLogAsync.java
+++ b/src/com/android/phone/common/CallLogAsync.java
@@ -20,6 +20,7 @@
 import android.os.AsyncTask;
 import android.os.Looper;
 import android.provider.CallLog.Calls;
+import android.telecomm.Subscription;
 import android.util.Log;
 import com.android.internal.telephony.CallerInfo;
 
@@ -72,6 +73,7 @@
                            String number,
                            int presentation,
                            int callType,
+                           Subscription subscription,
                            long timestamp,
                            long durationInMillis) {
             // Note that the context is passed each time. We could
@@ -96,6 +98,7 @@
             this.number = number;
             this.presentation = presentation;
             this.callType = callType;
+            this.subscription = subscription;
             this.timestamp = timestamp;
             this.durationInSec = (int)(durationInMillis / 1000);
         }
@@ -106,6 +109,7 @@
         public final String number;
         public final int presentation;
         public final int callType;
+        public final Subscription subscription;
         public final long timestamp;
         public final int durationInSec;
     }
@@ -162,7 +166,7 @@
                     // May block.
                     result[i] = Calls.addCall(
                             c.ci, c.context, c.number, c.presentation,
-                            c.callType, c.timestamp, c.durationInSec);
+                            c.callType, c.subscription, c.timestamp, c.durationInSec);
                 } catch (Exception e) {
                     // This must be very rare but may happen in legitimate cases.
                     // e.g. If the phone is encrypted and thus write request fails, it may
