Merge "Return null when setting can't be changed." into pi-dev

This commit is contained in:
TreeHugger Robot
2018-05-23 17:08:29 +00:00
committed by Android (Google) Code Review
5 changed files with 30 additions and 66 deletions

View File

@@ -114,7 +114,7 @@ public class WifiCallingSliceHelperTest {
final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
testWifiCallingSettingsUnavailableSlice(slice, null,
SliceBuilderUtils.getSettingsIntent(mContext));
WifiCallingSliceHelper.getSettingsIntent(mContext));
}
@Test
@@ -125,7 +125,7 @@ public class WifiCallingSliceHelperTest {
assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
testWifiCallingSettingsUnavailableSlice(slice, null,
SliceBuilderUtils.getSettingsIntent(mContext));
WifiCallingSliceHelper.getSettingsIntent(mContext));
}
@Test