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

Commit 4efca3f9 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Remove usages of notifyOemHookRawEventForSubscriber" am: 98f5c24b 

Change-Id: I8516bac0575c5efed68ceac58e44d5e06ecb80f7
parents 6490b20a 98f5c24b

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -207,12 +207,6 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
                sender.getSubId(), state);

                sender.getSubId(), state);

    }

    }





    @Override

    public void notifyOemHookRawEventForSubscriber(Phone sender, byte[] rawData) {

        mTelephonyRegistryMgr.notifyOemHookRawEventForSubscriber(sender.getSubId(),

            sender.getPhoneId(), rawData);

    }



    @Override

    @Override

    public void notifyDisplayInfoChanged(Phone sender, DisplayInfo displayInfo) {

    public void notifyDisplayInfoChanged(Phone sender, DisplayInfo displayInfo) {

        mTelephonyRegistryMgr.notifyDisplayInfoChanged(sender.getPhoneId(), sender.getSubId(),

        mTelephonyRegistryMgr.notifyDisplayInfoChanged(sender.getPhoneId(), sender.getSubId(),

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -716,13 +716,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                break;

                break;





            case EVENT_UNSOL_OEM_HOOK_RAW:

            case EVENT_UNSOL_OEM_HOOK_RAW:

                ar = (AsyncResult)msg.obj;

                // deprecated, ignore

                if (ar.exception == null) {

                    byte[] data = (byte[])ar.result;

                    mNotifier.notifyOemHookRawEventForSubscriber(this, data);

                } else {

                    Rlog.e(LOG_TAG, "OEM hook raw exception: " + ar.exception);

                }

                break;

                break;





            case EVENT_CONFIG_LCE:

            case EVENT_CONFIG_LCE:

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -87,9 +87,6 @@ public interface PhoneNotifier { 
    /** Send a notification that the users mobile data setting has changed */

    /** Send a notification that the users mobile data setting has changed */

    void notifyUserMobileDataStateChanged(Phone sender, boolean state);

    void notifyUserMobileDataStateChanged(Phone sender, boolean state);





    /** Send a notification with an OEM hook payload */

    void notifyOemHookRawEventForSubscriber(Phone sender, byte[] rawData);



    /** Send a notification that the display info has changed */

    /** Send a notification that the display info has changed */

    void notifyDisplayInfoChanged(Phone sender, DisplayInfo displayInfo);

    void notifyDisplayInfoChanged(Phone sender, DisplayInfo displayInfo);