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

Commit 0a872611 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "fixed typo in RIL_UNSOL_CDMA_PRL_CHANGED constant" into ics

parents 7a5f54ef 058e4fce

telephony/java/com/android/internal/telephony/RIL.java

+3 −3
Original line number Diff line number Diff line
@@ -2463,7 +2463,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            case RIL_UNSOL_RINGBACK_TONE: ret = responseInts(p); break;

            case RIL_UNSOL_RESEND_INCALL_MUTE: ret = responseVoid(p); break;

            case RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED: ret = responseInts(p); break;

            case RIL_UNSOl_CDMA_PRL_CHANGED: ret = responseInts(p); break;

            case RIL_UNSOL_CDMA_PRL_CHANGED: ret = responseInts(p); break;

            case RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break;

            case RIL_UNSOL_RIL_CONNECTED: ret = responseInts(p); break;
@@ -2783,7 +2783,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                }

                break;



            case RIL_UNSOl_CDMA_PRL_CHANGED:

            case RIL_UNSOL_CDMA_PRL_CHANGED:

                if (RILJ_LOGD) unsljLogRet(response, ret);



                if (mCdmaPrlChangedRegistrants != null) {
@@ -3604,7 +3604,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            case RIL_UNSOL_RINGBACK_TONE: return "UNSOL_RINGBACK_TONE";

            case RIL_UNSOL_RESEND_INCALL_MUTE: return "UNSOL_RESEND_INCALL_MUTE";

            case RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED: return "CDMA_SUBSCRIPTION_SOURCE_CHANGED";

            case RIL_UNSOl_CDMA_PRL_CHANGED: return "UNSOL_CDMA_PRL_CHANGED";

            case RIL_UNSOL_CDMA_PRL_CHANGED: return "UNSOL_CDMA_PRL_CHANGED";

            case RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE: return "UNSOL_EXIT_EMERGENCY_CALLBACK_MODE";

            case RIL_UNSOL_RIL_CONNECTED: return "UNSOL_RIL_CONNECTED";

            default: return "<unknown response: "+request+">";

telephony/java/com/android/internal/telephony/RILConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ cat include/telephony/ril.h | \ 
    int RIL_UNSOL_RINGBACK_TONE = 1029;

    int RIL_UNSOL_RESEND_INCALL_MUTE = 1030;

    int RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED = 1031;

    int RIL_UNSOl_CDMA_PRL_CHANGED = 1032;

    int RIL_UNSOL_CDMA_PRL_CHANGED = 1032;

    int RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE = 1033;

    int RIL_UNSOL_RIL_CONNECTED = 1034;

}

telephony/java/com/android/internal/telephony/Smdk4210RIL.java

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ public class Smdk4210RIL extends RIL implements CommandsInterface { 
            case RIL_UNSOL_RINGBACK_TONE: ret = responseInts(p); break;

            case RIL_UNSOL_RESEND_INCALL_MUTE: ret = responseVoid(p); break;

            case RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED: ret = responseInts(p); break;

            case RIL_UNSOl_CDMA_PRL_CHANGED: ret = responseInts(p); break;

            case RIL_UNSOL_CDMA_PRL_CHANGED: ret = responseInts(p); break;

            case RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break;

            case RIL_UNSOL_RIL_CONNECTED: ret = responseInts(p); break;
@@ -746,7 +746,7 @@ public class Smdk4210RIL extends RIL implements CommandsInterface { 
                }

                break;



            case RIL_UNSOl_CDMA_PRL_CHANGED:

            case RIL_UNSOL_CDMA_PRL_CHANGED:

                if (RILJ_LOGD) unsljLogRet(response, ret);



                if (mCdmaPrlChangedRegistrants != null) {