Merge "Fix WifiCallingSettingsForSubTest" into main

This commit is contained in:
Treehugger Robot
2024-11-14 12:38:00 +00:00
committed by Android (Google) Code Review

View File

@@ -49,6 +49,7 @@ import android.telephony.ims.ImsMmTelManager;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -400,6 +401,11 @@ public class WifiCallingSettingsForSubTest {
return null; return null;
} }
@Override
public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
return null;
}
@Override @Override
protected Object getSystemService(final String name) { protected Object getSystemService(final String name) {
switch (name) { switch (name) {