diff --git a/src/com/android/messaging/datamodel/SyncManager.java b/src/com/android/messaging/datamodel/SyncManager.java
index 5ac3d0a..28fc696 100644
--- a/src/com/android/messaging/datamodel/SyncManager.java
+++ b/src/com/android/messaging/datamodel/SyncManager.java
@@ -17,6 +17,7 @@
 package com.android.messaging.datamodel;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.provider.Telephony;
@@ -308,6 +309,14 @@
             // Primary users default SMS app - don't monitor telephony (most changes from this app)
             mNotifyOnChanges = false;
             mSyncOnChanges = false;
+            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
+                // This is default SMS app but on Auto platform, even default SMS app needs
+                // to be notified of changes because Bluetooth makes changes to Sms database
+                // (thru ContentProvider). Content Change notifications help the default SMS app
+                // refresh display with changes, whenever Bluetooth changes data in SMS db.
+                mNotifyOnChanges = true;
+                mSyncOnChanges = false;
+            }
         }
         if (mNotifyOnChanges || mSyncOnChanges) {
             context.getContentResolver().registerContentObserver(Telephony.MmsSms.CONTENT_URI,
