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

Commit 5cc52d46 authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
  More fix for 64 bit offset.
parents f16e4df6 91a685f1
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ status_t BpDrmManagerService::setPlaybackStatus(
    }

    data.writeInt32(playbackStatus);
    data.writeInt32(position);
    data.writeInt64(position);

    remote()->transact(SET_PLAYBACK_STATUS, data, &reply);
    return reply.readInt32();
@@ -1111,7 +1111,7 @@ status_t BnDrmManagerService::onTransact(
        }

        const status_t status
            = setPlaybackStatus(uniqueId, &handle, data.readInt32(), data.readInt32());
            = setPlaybackStatus(uniqueId, &handle, data.readInt32(), data.readInt64());
        reply->writeInt32(status);

        delete handle.decryptInfo; handle.decryptInfo = NULL;