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

Commit b85622a2 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Leverage useParcel extension 

Bug: 418243848
Flag: EXEMPT refactor
Test: atest
Change-Id: I00924a90eb31b2a719637ee07f79542a0277a098
parent f5c65163

packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGetterCodecs.kt

+39 −41
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
package com.android.settingslib.graph



import android.os.Bundle

import android.os.Parcel

import com.android.settingslib.graph.proto.PreferenceProto

import com.android.settingslib.ipc.MessageCodec

import com.android.settingslib.metadata.PreferenceCoordinate

import com.android.settingslib.metadata.useParcel

import java.util.Arrays



/** Message codec for [PreferenceGetterRequest]. */
@@ -57,20 +57,19 @@ class PreferenceGetterResponseCodec : MessageCodec<PreferenceGetterResponse> { 


    private fun Map<PreferenceCoordinate, Int>.toErrorsByteArray(): ByteArray? {

        if (isEmpty()) return null

        val parcel = Parcel.obtain()

        return useParcel { parcel ->

            parcel.writeInt(size)

            for ((coordinate, code) in this) {

                coordinate.writeToParcel(parcel, 0)

                parcel.writeInt(code)

            }

        val bytes = parcel.marshall()

        parcel.recycle()

        return bytes

            parcel.marshall()

        }

    }



    private fun Map<PreferenceCoordinate, PreferenceProto>.toPreferencesByteArray(): ByteArray? {

        if (isEmpty()) return null

        val parcel = Parcel.obtain()

        return useParcel { parcel ->

            parcel.writeInt(size)

            for ((coordinate, preferenceProto) in this) {

                coordinate.writeToParcel(parcel, 0)
@@ -78,9 +77,8 @@ class PreferenceGetterResponseCodec : MessageCodec<PreferenceGetterResponse> { 
                parcel.writeInt(data.size)

                parcel.writeByteArray(data)

            }

        val bytes = parcel.marshall()

        parcel.recycle()

        return bytes

            parcel.marshall()

        }

    }



    override fun decode(data: Bundle) =
@@ -91,7 +89,7 @@ class PreferenceGetterResponseCodec : MessageCodec<PreferenceGetterResponse> { 


    private fun ByteArray?.toErrors(): Map<PreferenceCoordinate, Int> {

        if (this == null) return emptyMap()

        val parcel = Parcel.obtain()

        return useParcel { parcel ->

            parcel.unmarshall(this, 0, size)

            parcel.setDataPosition(0)

            val count = parcel.readInt()
@@ -100,13 +98,13 @@ class PreferenceGetterResponseCodec : MessageCodec<PreferenceGetterResponse> { 
                val coordinate = PreferenceCoordinate(parcel)

                errors[coordinate] = parcel.readInt()

            }

        parcel.recycle()

        return errors

            errors

        }

    }



    private fun ByteArray?.toPreferences(): Map<PreferenceCoordinate, PreferenceProto> {

        if (this == null) return emptyMap()

        val parcel = Parcel.obtain()

        return useParcel { parcel ->

            parcel.unmarshall(this, 0, size)

            parcel.setDataPosition(0)

            val count = parcel.readInt()
@@ -117,8 +115,8 @@ class PreferenceGetterResponseCodec : MessageCodec<PreferenceGetterResponse> { 
                val array = ByteArray(bytes).also { parcel.readByteArray(it) }

                preferences[coordinate] = PreferenceProto.parseFrom(array)

            }

        parcel.recycle()

        return preferences

            preferences

        }

    }



    companion object {

packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Bundles.kt

+5 −6
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ fun Parcelable.marshallParcel(): ByteArray = useParcel { parcel -> 
fun ByteArray.unmarshallBundle(): Bundle = unmarshallParcel(Bundle.CREATOR)



/** Unmarshall a byte array to [Parcelable]. */

inline fun <reified T> ByteArray.unmarshallParcel(creator: Parcelable.Creator<T>): T =

    useParcel { parcel ->

fun <T> ByteArray.unmarshallParcel(creator: Parcelable.Creator<T>): T = useParcel { parcel ->

    parcel.unmarshall(this, 0, size)

    parcel.setDataPosition(0)

    return@useParcel creator.createFromParcel(parcel)