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

Commit 8db090e7 authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Fix DeviceSettingsConfig parcelable" into main

parents 7391c2e8 f8f6ade4

packages/SettingsLib/src/com/android/settingslib/bluetooth/devicesettings/DeviceSettingsConfig.kt

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ data class DeviceSettingsConfig( 
                                },

                            moreSettingsHelpItem = readParcelable(

                                DeviceSettingItem::class.java.classLoader

                            )

                            ),

                            extras = readBundle((Bundle::class.java.classLoader)) ?: Bundle.EMPTY,

                        )

                    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/devicesettings/DeviceSettingsConfigTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ class DeviceSettingsConfigTest { 
        assertThat(fromParcel.moreSettingsHelpItem?.packageName).isEqualTo("package_name_2")

        assertThat(fromParcel.moreSettingsHelpItem?.className).isEqualTo("class_name_2")

        assertThat(fromParcel.moreSettingsHelpItem?.intentAction).isEqualTo("intent_action_2")

        assertThat(fromParcel.extras.getString("key1")).isEqualTo("value1")

    }



    private fun writeAndRead(item: DeviceSettingsConfig): DeviceSettingsConfig {