diff --git a/src/com/android/messaging/ui/BlockedParticipantsFragment.java b/src/com/android/messaging/ui/BlockedParticipantsFragment.java
index 528332d..d80bb30 100644
--- a/src/com/android/messaging/ui/BlockedParticipantsFragment.java
+++ b/src/com/android/messaging/ui/BlockedParticipantsFragment.java
@@ -65,11 +65,6 @@ public class BlockedParticipantsFragment extends Fragment
         return view;
     }
 
-    @Override
-    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/src/com/android/messaging/ui/conversation/ConversationFragment.java b/src/com/android/messaging/ui/conversation/ConversationFragment.java
index 0bdfc06..1b2b662 100644
--- a/src/com/android/messaging/ui/conversation/ConversationFragment.java
+++ b/src/com/android/messaging/ui/conversation/ConversationFragment.java
@@ -1200,14 +1200,6 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
         dialog.show(ft, null/*tag*/);
     }
 
-    @Override
-    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
-        if (mChangeDefaultSmsAppHelper == null) {
-            mChangeDefaultSmsAppHelper = new ChangeDefaultSmsAppHelper();
-        }
-        mChangeDefaultSmsAppHelper.handleChangeDefaultSmsResult(requestCode, resultCode, null);
-    }
-
     public boolean hasMessages() {
         return mAdapter != null && mAdapter.getItemCount() > 0;
     }
diff --git a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java
index f71301a..8335e30 100644
--- a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java
+++ b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java
@@ -25,6 +25,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -41,6 +43,7 @@ import com.android.messaging.ui.UIIntents;
 import com.android.messaging.ui.contact.AddContactsConfirmationDialog;
 import com.android.messaging.ui.conversationlist.ConversationListFragment.ConversationListFragmentHost;
 import com.android.messaging.ui.conversationlist.MultiSelectActionModeCallback.SelectedConversation;
+import com.android.messaging.util.ChangeDefaultSmsAppHelper;
 import com.android.messaging.util.PhoneUtils;
 import com.android.messaging.util.UiUtils;
 
@@ -59,6 +62,19 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAct
 
     protected ConversationListFragment mConversationListFragment;
 
+    private ChangeDefaultSmsAppHelper mChangeDefaultSmsAppHelper;
+
+    private final ActivityResultLauncher<Intent> mLauncher = registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(), result -> {
+                if (result.getResultCode() == Activity.RESULT_OK) {
+                    if (mChangeDefaultSmsAppHelper == null) {
+                        mChangeDefaultSmsAppHelper = new ChangeDefaultSmsAppHelper();
+                    }
+                    mChangeDefaultSmsAppHelper.handleChangeDefaultSmsResult(
+                            REQUEST_SET_DEFAULT_SMS_APP, result.getResultCode(), null);
+                }
+            });
+
     @Override
     public void onBackPressed() {
         // If action mode is active dismiss it
@@ -101,7 +117,7 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAct
                     SnackBar.Action.createCustomAction(() -> {
                         final Intent intent =
                                 UIIntents.get().getChangeDefaultSmsAppIntent(activity);
-                        startActivityForResult(intent, REQUEST_SET_DEFAULT_SMS_APP);
+                        mLauncher.launch(intent);
                     },
                         getString(R.string.requires_default_sms_change_button)),
                     null /* interactions */,