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

Commit a97bdb95 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Fix mis-ordered merge in PhoneStateListener.java"

parents 00496a11 27de0e51
Loading
Loading
Loading
Loading
+17 −16
Original line number Original line Diff line number Diff line
@@ -438,12 +438,12 @@ public class PhoneStateListener {
                        PhoneStateListener.this.onPhoneCapabilityChanged(
                        PhoneStateListener.this.onPhoneCapabilityChanged(
                                (PhoneCapability) msg.obj);
                                (PhoneCapability) msg.obj);
                        break;
                        break;
                    case LISTEN_RADIO_POWER_STATE_CHANGED:
                        PhoneStateListener.this.onRadioPowerStateChanged((int) msg.obj);
                        break;
                    case LISTEN_PREFERRED_DATA_SUBID_CHANGE:
                    case LISTEN_PREFERRED_DATA_SUBID_CHANGE:
                        PhoneStateListener.this.onPreferredDataSubIdChanged((int) msg.obj);
                        PhoneStateListener.this.onPreferredDataSubIdChanged((int) msg.obj);
                        break;
                        break;
                    case LISTEN_RADIO_POWER_STATE_CHANGED:
                        PhoneStateListener.this.onRadioPowerStateChanged((int) msg.obj);
                        break;
                }
                }
            }
            }
        };
        };
@@ -684,25 +684,25 @@ public class PhoneStateListener {
    }
    }


    /**
    /**
     * Callback invoked when modem radio power state changes. Requires
     * Callback invoked when preferred data subId changes. Requires
     * the READ_PRIVILEGED_PHONE_STATE permission.
     * the READ_PRIVILEGED_PHONE_STATE permission.
     * @param state the modem radio power state
     * @param subId the new preferred data subId. If it's INVALID_SUBSCRIPTION_ID,
     *              it means it's unset and defaultDataSub is used to determine which
     *              modem is preferred.
     * @hide
     * @hide
     */
     */
    @SystemApi
    public void onPreferredDataSubIdChanged(int subId) {
    public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
        // default implementation empty
        // default implementation empty
    }
    }


    /**
    /**
     * Callback invoked when preferred data subId changes. Requires
     * Callback invoked when modem radio power state changes. Requires
     * the READ_PRIVILEGED_PHONE_STATE permission.
     * the READ_PRIVILEGED_PHONE_STATE permission.
     * @param subId the new preferred data subId. If it's INVALID_SUBSCRIPTION_ID,
     * @param state the modem radio power state
     *              it means it's unset and defaultDataSub is used to determine which
     *              modem is preferred.
     * @hide
     * @hide
     */
     */
    public void onPreferredDataSubIdChanged(int subId) {
    @SystemApi
    public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
        // default implementation empty
        // default implementation empty
    }
    }


@@ -838,13 +838,14 @@ public class PhoneStateListener {
            send(LISTEN_PHONE_CAPABILITY_CHANGE, 0, 0, capability);
            send(LISTEN_PHONE_CAPABILITY_CHANGE, 0, 0, capability);
        }
        }


        public void onPreferredDataSubIdChanged(int subId) {
            send(LISTEN_PREFERRED_DATA_SUBID_CHANGE, 0, 0, subId);
        }

        public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
        public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
            send(LISTEN_RADIO_POWER_STATE_CHANGED, 0, 0, state);
            send(LISTEN_RADIO_POWER_STATE_CHANGED, 0, 0, state);
        }
        }


        public void onPreferredDataSubIdChanged(int subId) {
            send(LISTEN_PREFERRED_DATA_SUBID_CHANGE, 0, 0, subId);
        }
    }
    }


    /**
    /**