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

Commit 461b18ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "correct the comments information for settings" am: 85563e7a am:... 

Merge "correct the comments information for settings" am: 85563e7a am: 2977523d am: fe85cf44 am: 330ec195 am: 184aa87e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132182



Change-Id: I9173e3985c28a47305220a90c6763c1730997467
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 719acc6d 184aa87e

services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class SettingsToPropertiesMapperTest { 


    @Test

    public void testUpdatePropertiesFromSettings_PropertyAndSettingNotPresent() {

        // Test that empty property will not not be set if setting is not set

        // Test that empty property will not be set if setting is not set

        mTestMapper.updatePropertiesFromSettings();

        String propValue = mSystemSettingsMap.get("TestProperty");

        Assert.assertNull("Property should not be set if setting is null", propValue);