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

Commit 26d6acaa authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Delete unused intents."

parents 968aa2f1 42f399bf

src/java/com/android/internal/telephony/CarrierResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public class CarrierResolver extends Handler { 
    /**

     * This is triggered from SubscriptionInfoUpdater after sim state change.

     * The sequence of sim loading would be

     *  1. ACTION_SUBINFO_CONTENT_CHANGE

     *  1. OnSubscriptionsChangedListener

     *  2. ACTION_SIM_STATE_CHANGED/ACTION_SIM_CARD_STATE_CHANGED

     *  /ACTION_SIM_APPLICATION_STATE_CHANGED

     *  3. ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −14
Original line number Diff line number Diff line
@@ -492,17 +492,6 @@ public class SubscriptionController extends ISub.Stub { 
        }

    }



    /**

     * Broadcast when SubscriptionInfo has changed

     * FIXME: Hopefully removed if the API council accepts SubscriptionInfoListener

     */

     private void broadcastSimInfoContentChanged() {

        Intent intent = new Intent(TelephonyIntents.ACTION_SUBINFO_CONTENT_CHANGE);

        mContext.sendBroadcast(intent);

        intent = new Intent(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED);

        mContext.sendBroadcast(intent);

     }



    /**

     * Notify the changed of subscription info.

     */
@@ -514,9 +503,6 @@ public class SubscriptionController extends ISub.Stub { 
        if (DBG) logd("notifySubscriptionInfoChanged:");

        trm.notifySubscriptionInfoChanged();



        // FIXME: Remove if listener technique accepted.

        broadcastSimInfoContentChanged();



        MultiSimSettingController.getInstance().notifySubscriptionInfoChanged();

        TelephonyMetrics metrics = TelephonyMetrics.getInstance();

        List<SubscriptionInfo> subInfos;

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+2 −1
Original line number Diff line number Diff line
@@ -612,7 +612,8 @@ public class SubscriptionInfoUpdater extends Handler { 


        /**

         * The sim loading sequence will be

         *  1. ACTION_SUBINFO_CONTENT_CHANGE happens through updateSubscriptionInfoByIccId() above.

         *  1. OnSubscriptionsChangedListener is called through updateSubscriptionInfoByIccId()

         *  above.

         *  2. ACTION_SIM_STATE_CHANGED/ACTION_SIM_CARD_STATE_CHANGED

         *  /ACTION_SIM_APPLICATION_STATE_CHANGED

         *  3. ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

+0 −25
Original line number Diff line number Diff line
@@ -273,12 +273,6 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        assertEquals(iconTint, subInfo.getIconTint());

        assertEquals(disNum, subInfo.getNumber());

        assertEquals(isOpportunistic, subInfo.isOpportunistic());



        /* verify broadcast intent */

        ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);

        verify(mContext, atLeast(1)).sendBroadcast(captorIntent.capture());

        assertEquals(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED,

                captorIntent.getValue().getAction());

    }



    @Test @SmallTest
@@ -299,13 +293,6 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        assertNotNull(subInfo);

        assertEquals(disName, subInfo.getDisplayName());

        assertEquals(nameSource, subInfo.getNameSource());



        /* verify broadcast intent */

        ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);

        verify(mContext, atLeast(1)).sendBroadcast(captorIntent.capture());

        assertEquals(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED,

                captorIntent.getValue().getAction());



    }



    private void setSimEmbedded(boolean isEmbedded) throws Exception {
@@ -584,12 +571,6 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        assertNotNull(subInfo);

        assertEquals(Integer.parseInt(mCcMncVERIZON.substring(0, 3)), subInfo.getMcc());

        assertEquals(Integer.parseInt(mCcMncVERIZON.substring(3)), subInfo.getMnc());



         /* verify broadcast intent */

        ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);

        verify(mContext, atLeast(1)).sendBroadcast(captorIntent.capture());

        assertEquals(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED,

                captorIntent.getValue().getAction());

    }



    @Test @SmallTest
@@ -602,12 +583,6 @@ public class SubscriptionControllerTest extends TelephonyTest { 
                .getActiveSubscriptionInfo(1, mCallingPackage, mCallingFeature);

        assertNotNull(subInfo);

        assertEquals(carrierId, subInfo.getCarrierId());



         /* verify broadcast intent */

        ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);

        verify(mContext, atLeast(1)).sendBroadcast(captorIntent.capture());

        assertEquals(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED,

                captorIntent.getValue().getAction());

    }



    @Test