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

Commit ffedff3e authored by Alice Ryhl's avatar Alice Ryhl Committed by Android (Google) Code Review
Browse files

Merge changes Iae2add53,Ia9b990ad into main 

* changes:
  IPCThreadState: remove spurious call to readInt32 in BC_FROZEN_BINDER
  IPCThreadState: fix indentation of freeze cases in match
parents 54cd5a5c 1892789e

libs/binder/IPCThreadState.cpp

+12 −7
Original line number Original line Diff line number Diff line
@@ -1597,15 +1597,18 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
            proxy->sendObituary();

            proxy->sendObituary();

            mOut.writeInt32(BC_DEAD_BINDER_DONE);

            mOut.writeInt32(BC_DEAD_BINDER_DONE);

            mOut.writePointer((uintptr_t)proxy);

            mOut.writePointer((uintptr_t)proxy);

        } break;

        }

        break;





    case BR_CLEAR_DEATH_NOTIFICATION_DONE:

    case BR_CLEAR_DEATH_NOTIFICATION_DONE:

        {

        {

            BpBinder *proxy = (BpBinder*)mIn.readPointer();

            BpBinder *proxy = (BpBinder*)mIn.readPointer();

            proxy->getWeakRefs()->decWeak(proxy);

            proxy->getWeakRefs()->decWeak(proxy);

        } break;

        }

        break;





        case BR_FROZEN_BINDER: {

    case BR_FROZEN_BINDER:

        {

            const struct binder_frozen_state_info* data =

            const struct binder_frozen_state_info* data =

                    reinterpret_cast<const struct binder_frozen_state_info*>(

                    reinterpret_cast<const struct binder_frozen_state_info*>(

                            mIn.readInplace(sizeof(struct binder_frozen_state_info)));

                            mIn.readInplace(sizeof(struct binder_frozen_state_info)));
@@ -1614,16 +1617,18 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
                break;

                break;

            }

            }

            BpBinder* proxy = (BpBinder*)data->cookie;

            BpBinder* proxy = (BpBinder*)data->cookie;

            bool isFrozen = mIn.readInt32() > 0;

            proxy->getPrivateAccessor().onFrozenStateChanged(data->is_frozen);

            proxy->getPrivateAccessor().onFrozenStateChanged(data->is_frozen);

            mOut.writeInt32(BC_FREEZE_NOTIFICATION_DONE);

            mOut.writeInt32(BC_FREEZE_NOTIFICATION_DONE);

            mOut.writePointer(data->cookie);

            mOut.writePointer(data->cookie);

        } break;

        }

        break;





        case BR_CLEAR_FREEZE_NOTIFICATION_DONE: {

   case BR_CLEAR_FREEZE_NOTIFICATION_DONE:

        {

            BpBinder* proxy = (BpBinder*)mIn.readPointer();

            BpBinder* proxy = (BpBinder*)mIn.readPointer();

            proxy->getWeakRefs()->decWeak(proxy);

            proxy->getWeakRefs()->decWeak(proxy);

        } break;

        }

        break;





    case BR_FINISHED:

    case BR_FINISHED:

        result = TIMED_OUT;

        result = TIMED_OUT;