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

Commit 32a05414 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "Checking 'phoneId' when sim status is changed" am: c5770ff7 am: 680eea85 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2095506



Change-Id: Ifeaf68696b364360f92f91efb1eb479c8255c3aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d2a4211 680eea85

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.Registrant; 
import android.os.RegistrantList;

import android.os.RegistrantList;

import android.provider.Settings;

import android.provider.Settings;

import android.provider.Telephony;

import android.provider.Telephony;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.util.LocalLog;

import android.util.LocalLog;

import android.util.Log;

import android.util.Log;
@@ -93,9 +94,13 @@ public class CarrierActionAgent extends Handler { 
                    // ignore rebroadcast since carrier apps are direct boot aware.

                    // ignore rebroadcast since carrier apps are direct boot aware.

                    return;

                    return;

                }

                }

                final int phoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY,

                        SubscriptionManager.INVALID_PHONE_INDEX);

                if (mPhone.getPhoneId() == phoneId) {

                    sendMessage(obtainMessage(EVENT_SIM_STATE_CHANGED, iccState));

                    sendMessage(obtainMessage(EVENT_SIM_STATE_CHANGED, iccState));

                }

                }

            }

            }

        }

    };

    };





    /** Constructor */

    /** Constructor */

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        final Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        final Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,

        intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,

                IccCardConstants.INTENT_VALUE_ICC_LOADED);

                IccCardConstants.INTENT_VALUE_ICC_LOADED);

        intent.putExtra(PhoneConstants.PHONE_KEY, mPhone.getPhoneId());

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent);

        processAllMessages();

        processAllMessages();
@@ -134,6 +135,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        final Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        final Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,

        intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,

                IccCardConstants.INTENT_VALUE_ICC_LOADED);

                IccCardConstants.INTENT_VALUE_ICC_LOADED);

        intent.putExtra(PhoneConstants.PHONE_KEY, mPhone.getPhoneId());

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent);

        processAllMessages();

        processAllMessages();