Merge "Update ShadowDevicConfig" into main

This commit is contained in:
Fan Wu
2024-01-18 06:08:52 +00:00
committed by Android (Google) Code Review

View File

@@ -16,7 +16,6 @@
package com.android.settings.testutils.shadow; package com.android.settings.testutils.shadow;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements; import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter; import org.robolectric.annotation.Resetter;
@@ -25,7 +24,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
@Implements(android.provider.DeviceConfig.class) @Implements(android.provider.DeviceConfig.class)
public class ShadowDeviceConfig { public class ShadowDeviceConfig extends org.robolectric.shadows.ShadowDeviceConfig {
private static Map<String, String> sPropertyMaps = new HashMap<>(); private static Map<String, String> sPropertyMaps = new HashMap<>();