Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c6848a7 authored by Steve Statia's avatar Steve Statia
Browse files

Fix to unregister the mSmsBroadcastReceiver from CatService when the 

process is disposed.

During some stress test this would cause issues as the maximum number of broadcast
receivers per process is 1000, casuing anything after that to not be
registered.

Bug: 338936403
Test: manual test removing/inserting psim and disable/enable esim

Change-Id: Iecf801ba4c9c9b463ff072f436d00dc967d90e80
parent 674b7854

flags/messaging.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -28,3 +28,14 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=stevestatia TARGET=24Q3

flag {

    name: "unregister_sms_broadcast_receiver_from_cat_service"

    namespace: "telephony"

    description: "This flag will unregister the sms broadcast receiver in the CatService when the process is disposed."

    bug: "338936403"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

src/java/com/android/internal/telephony/cat/CatService.java

+8 −0
Original line number Diff line number Diff line
@@ -284,6 +284,14 @@ public class CatService extends Handler implements AppInterface { 
            CatLog.d(this, "Disposing CatService object");

            mIccRecords.unregisterForRecordsLoaded(this);



            if (sFlags.unregisterSmsBroadcastReceiverFromCatService()) {

                try {

                    mContext.unregisterReceiver(mSmsBroadcastReceiver);

                } catch (IllegalArgumentException e) {

                    CatLog.e(this, "mSmsBroadcastReceiver: was not registered" + e);

                }

            }



            // Clean up stk icon if dispose is called

            broadcastCardStateAndIccRefreshResp(CardState.CARDSTATE_ABSENT, null);