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

Commit 610e99f6 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "fix the class not found crash"

parents 1ea086d7 259c77ea

src/java/com/android/internal/telephony/cat/CatCmdMessage.java

+7 −7
Original line number Diff line number Diff line
@@ -138,10 +138,10 @@ public class CatCmdMessage implements Parcelable { 
    }



    public CatCmdMessage(Parcel in) {

        mCmdDet = in.readParcelable(null);

        mTextMsg = in.readParcelable(null);

        mMenu = in.readParcelable(null);

        mInput = in.readParcelable(null);

        mCmdDet = in.readParcelable(CommandDetails.class.getClassLoader());

        mTextMsg = in.readParcelable(TextMessage.class.getClassLoader());

        mMenu = in.readParcelable(Menu.class.getClassLoader());

        mInput = in.readParcelable(Input.class.getClassLoader());

        mLoadIconFailed = (in.readByte() == 1);

        switch (getCmdType()) {

        case LAUNCH_BROWSER:
@@ -150,12 +150,12 @@ public class CatCmdMessage implements Parcelable { 
            mBrowserSettings.mode = LaunchBrowserMode.values()[in.readInt()];

            break;

        case PLAY_TONE:

            mToneSettings = in.readParcelable(null);

            mToneSettings = in.readParcelable(ToneSettings.class.getClassLoader());

            break;

        case SET_UP_CALL:

            mCallSettings = new CallSettings();

            mCallSettings.confirmMsg = in.readParcelable(null);

            mCallSettings.callMsg = in.readParcelable(null);

            mCallSettings.confirmMsg = in.readParcelable(TextMessage.class.getClassLoader());

            mCallSettings.callMsg = in.readParcelable(TextMessage.class.getClassLoader());

            break;

        case SET_UP_EVENT_LIST:

            mSetupEventListSettings = new SetupEventListSettings();

src/java/com/android/internal/telephony/cat/CommandDetails.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ abstract class ValueObject { 
 * Class for Command Details object of proactive commands from SIM.

 * {@hide}

 */

class CommandDetails extends ValueObject implements Parcelable {

public class CommandDetails extends ValueObject implements Parcelable {

    @UnsupportedAppUsage

    public boolean compRequired;

    @UnsupportedAppUsage

src/java/com/android/internal/telephony/cat/Input.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class Input implements Parcelable { 
    private Input(Parcel in) {

        text = in.readString();

        defaultText = in.readString();

        icon = in.readParcelable(null);

        icon = in.readParcelable(Bitmap.class.getClassLoader());

        minLen = in.readInt();

        maxLen = in.readInt();

        ucs2 = in.readInt() == 1 ? true : false;

src/java/com/android/internal/telephony/cat/Item.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class Item implements Parcelable { 
    public Item(Parcel in) {

        id = in.readInt();

        text = in.readString();

        icon = in.readParcelable(null);

        icon = in.readParcelable(Bitmap.class.getClassLoader());

    }



    @Override

src/java/com/android/internal/telephony/cat/Menu.java

+2 −2
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ public class Menu implements Parcelable { 


    private Menu(Parcel in) {

        title = in.readString();

        titleIcon = in.readParcelable(null);

        titleIcon = in.readParcelable(Bitmap.class.getClassLoader());

        // rebuild items list.

        items = new ArrayList<Item>();

        int size = in.readInt();

        for (int i=0; i<size; i++) {

            Item item = in.readParcelable(null);

            Item item = in.readParcelable(Item.class.getClassLoader());

            items.add(item);

        }

        defaultItem = in.readInt();