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

Commit 69bfb496 authored by Taesu Lee's avatar Taesu Lee Committed by android-build-merger
Browse files

Merge "Use SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED instead"... 

Merge "Use SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED instead" am: 5657d94b am: bee3f643
am: 9b585d8e

Change-Id: Ic31bfe2939108e1cded2890bc40cff029dff047b
parents 3d96a843 9b585d8e

services/core/java/com/android/server/TelephonyRegistry.java

+20 −16
Original line number Original line Diff line number Diff line
@@ -285,11 +285,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                }

                }

                case MSG_UPDATE_DEFAULT_SUB: {

                case MSG_UPDATE_DEFAULT_SUB: {

                    int newDefaultPhoneId = msg.arg1;

                    int newDefaultPhoneId = msg.arg1;

                    int newDefaultSubId = (Integer)(msg.obj);

                    int newDefaultSubId = msg.arg2;

                    if (VDBG) {

                    if (VDBG) {

                        log("MSG_UPDATE_DEFAULT_SUB:current mDefaultSubId=" + mDefaultSubId

                        log("MSG_UPDATE_DEFAULT_SUB:current mDefaultSubId=" + mDefaultSubId

                            + " current mDefaultPhoneId=" + mDefaultPhoneId + " newDefaultSubId= "

                                + " current mDefaultPhoneId=" + mDefaultPhoneId

                            + newDefaultSubId + " newDefaultPhoneId=" + newDefaultPhoneId);

                                + " newDefaultSubId=" + newDefaultSubId

                                + " newDefaultPhoneId=" + newDefaultPhoneId);

                    }

                    }





                    //Due to possible risk condition,(notify call back using the new

                    //Due to possible risk condition,(notify call back using the new
@@ -306,7 +307,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    mDefaultSubId = newDefaultSubId;

                    mDefaultSubId = newDefaultSubId;

                    mDefaultPhoneId = newDefaultPhoneId;

                    mDefaultPhoneId = newDefaultPhoneId;

                    mLocalLog.log("Default subscription updated: mDefaultPhoneId="

                    mLocalLog.log("Default subscription updated: mDefaultPhoneId="

                            + mDefaultPhoneId + ", mDefaultSubId" + mDefaultSubId);

                            + mDefaultPhoneId + ", mDefaultSubId=" + mDefaultSubId);

                }

                }

            }

            }

        }

        }
@@ -336,22 +337,25 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);

                int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);

                if (DBG) log("onReceive: userHandle=" + userHandle);

                if (DBG) log("onReceive: userHandle=" + userHandle);

                mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCHED, userHandle, 0));

                mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCHED, userHandle, 0));

            } else if (action.equals(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) {

            } else if (action.equals(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) {

                Integer newDefaultSubIdObj = new Integer(intent.getIntExtra(

                int newDefaultSubId = intent.getIntExtra(

                        PhoneConstants.SUBSCRIPTION_KEY,

                        SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,

                        SubscriptionManager.getDefaultSubscriptionId()));

                        SubscriptionManager.getDefaultSubscriptionId());

                int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY,

                int newDefaultPhoneId = intent.getIntExtra(

                    SubscriptionManager.getPhoneId(mDefaultSubId));

                        PhoneConstants.PHONE_KEY,

                        SubscriptionManager.getPhoneId(newDefaultSubId));

                if (DBG) {

                if (DBG) {

                    log("onReceive:current mDefaultSubId=" + mDefaultSubId

                    log("onReceive:current mDefaultSubId=" + mDefaultSubId

                        + " current mDefaultPhoneId=" + mDefaultPhoneId + " newDefaultSubId= "

                            + " current mDefaultPhoneId=" + mDefaultPhoneId

                        + newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId);

                            + " newDefaultSubId=" + newDefaultSubId

                            + " newDefaultPhoneId=" + newDefaultPhoneId);

                }

                }





                if(validatePhoneId(newDefaultPhoneId) && (!newDefaultSubIdObj.equals(mDefaultSubId)

                if (validatePhoneId(newDefaultPhoneId)

                        || (newDefaultPhoneId != mDefaultPhoneId))) {

                        && (newDefaultSubId != mDefaultSubId

                                || newDefaultPhoneId != mDefaultPhoneId)) {

                    mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB,

                    mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB,

                            newDefaultPhoneId, 0, newDefaultSubIdObj));

                            newDefaultPhoneId, newDefaultSubId));

                }

                }

            }

            }

        }

        }
@@ -450,7 +454,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        final IntentFilter filter = new IntentFilter();

        final IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        filter.addAction(Intent.ACTION_USER_REMOVED);

        filter.addAction(Intent.ACTION_USER_REMOVED);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED);

        filter.addAction(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED);

        log("systemRunning register for intents");

        log("systemRunning register for intents");

        mContext.registerReceiver(mBroadcastReceiver, filter);

        mContext.registerReceiver(mBroadcastReceiver, filter);

    }

    }