PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Code refactor for IMS part

Browse Source 
Return boolean in method names starting with "is".

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Change-Id: I2a9ca9ae829f0dcda478f3343cd50e61f441a9a7
This commit is contained in:
Bonian Chen
2020-02-14 03:41:33 +08:00
parent fd8e319801
commit 4074e9aab7
8 changed files with 48 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/ims/ImsQueryController.java
View File

@@ -47,13 +47,15 @@ abstract class ImsQueryController {
mTransportType = transportType; mTransportType = transportType;
} }
abstract boolean isEnabledByUser(int subId);
@VisibleForTesting @VisibleForTesting
ImsQuery isTtyOnVolteEnabled(int subId) { boolean isTtyOnVolteEnabled(int subId) {
return new ImsQueryTtyOnVolteStat(subId); return (new ImsQueryTtyOnVolteStat(subId)).query();
} }
@VisibleForTesting @VisibleForTesting
ImsQuery isProvisionedOnDevice(int subId) { boolean isProvisionedOnDevice(int subId) {
return new ImsQueryProvisioningStat(subId, mCapability, mTech); return (new ImsQueryProvisioningStat(subId, mCapability, mTech)).query();
} }
} }

10
src/com/android/settings/network/ims/VolteQueryImsState.java
View File

@@ -55,8 +55,8 @@ public class VolteQueryImsState extends ImsQueryController {
* Implementation of ImsQueryController#isEnabledByUser(int subId) * Implementation of ImsQueryController#isEnabledByUser(int subId)
*/ */
@VisibleForTesting @VisibleForTesting
ImsQuery isEnabledByUser(int subId) { boolean isEnabledByUser(int subId) {
return new ImsQueryEnhanced4gLteModeUserSetting(subId); return (new ImsQueryEnhanced4gLteModeUserSetting(subId)).query();
} }
@VisibleForTesting @VisibleForTesting
@@ -77,7 +77,7 @@ public class VolteQueryImsState extends ImsQueryController {
} }
return imsManager.isVolteEnabledByPlatform() return imsManager.isVolteEnabledByPlatform()
&& isProvisionedOnDevice(mSubId).query(); && isProvisionedOnDevice(mSubId);
} }
/** /**
@@ -101,7 +101,7 @@ public class VolteQueryImsState extends ImsQueryController {
} }
return ((!isTtyEnabled(mContext)) return ((!isTtyEnabled(mContext))
|| (isTtyOnVolteEnabled(mSubId).query())); || (isTtyOnVolteEnabled(mSubId)));
} }
@VisibleForTesting @VisibleForTesting
@@ -119,6 +119,6 @@ public class VolteQueryImsState extends ImsQueryController {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) { if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false; return false;
} }
return isEnabledByUser(mSubId).query(); return isEnabledByUser(mSubId);
} }
} }

10
src/com/android/settings/network/ims/VtQueryImsState.java
View File

@@ -55,8 +55,8 @@ public class VtQueryImsState extends ImsQueryController {
* Implementation of ImsQueryController#isEnabledByUser(int subId) * Implementation of ImsQueryController#isEnabledByUser(int subId)
*/ */
@VisibleForTesting @VisibleForTesting
ImsQuery isEnabledByUser(int subId) { boolean isEnabledByUser(int subId) {
return new ImsQueryVtUserSetting(subId); return (new ImsQueryVtUserSetting(subId)).query();
} }
@VisibleForTesting @VisibleForTesting
@@ -77,7 +77,7 @@ public class VtQueryImsState extends ImsQueryController {
} }
return imsManager.isVtEnabledByPlatform() return imsManager.isVtEnabledByPlatform()
&& isProvisionedOnDevice(mSubId).query() && isProvisionedOnDevice(mSubId)
&& MobileNetworkUtils.isImsServiceStateReady(imsManager); && MobileNetworkUtils.isImsServiceStateReady(imsManager);
} }
@@ -91,7 +91,7 @@ public class VtQueryImsState extends ImsQueryController {
return false; return false;
} }
return ((!isTtyEnabled(mContext)) return ((!isTtyEnabled(mContext))
|| (isTtyOnVolteEnabled(mSubId).query())); || (isTtyOnVolteEnabled(mSubId)));
} }
@VisibleForTesting @VisibleForTesting
@@ -109,6 +109,6 @@ public class VtQueryImsState extends ImsQueryController {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) { if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false; return false;
} }
return isEnabledByUser(mSubId).query(); return isEnabledByUser(mSubId);
} }
} }

10
src/com/android/settings/network/ims/WifiCallingQueryImsState.java
View File

@@ -55,8 +55,8 @@ public class WifiCallingQueryImsState extends ImsQueryController {
* Implementation of ImsQueryController#isEnabledByUser(int subId) * Implementation of ImsQueryController#isEnabledByUser(int subId)
*/ */
@VisibleForTesting @VisibleForTesting
ImsQuery isEnabledByUser(int subId) { boolean isEnabledByUser(int subId) {
return new ImsQueryWfcUserSetting(subId); return (new ImsQueryWfcUserSetting(subId)).query();
} }
@VisibleForTesting @VisibleForTesting
@@ -77,7 +77,7 @@ public class WifiCallingQueryImsState extends ImsQueryController {
} }
return imsManager.isWfcEnabledByPlatform() return imsManager.isWfcEnabledByPlatform()
&& isProvisionedOnDevice(mSubId).query(); && isProvisionedOnDevice(mSubId);
} }
/** /**
@@ -101,7 +101,7 @@ public class WifiCallingQueryImsState extends ImsQueryController {
} }
return ((!isTtyEnabled(mContext)) return ((!isTtyEnabled(mContext))
|| (isTtyOnVolteEnabled(mSubId).query())); || (isTtyOnVolteEnabled(mSubId)));
} }
@VisibleForTesting @VisibleForTesting
@@ -119,6 +119,6 @@ public class WifiCallingQueryImsState extends ImsQueryController {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) { if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false; return false;
} }
return isEnabledByUser(mSubId).query(); return isEnabledByUser(mSubId);
} }
} }

38
tests/robotests/src/com/android/settings/network/ims/MockImsQueryResult.java
View File

@@ -1,38 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network.ims;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class MockImsQueryResult {
public static class BooleanResult implements ImsQuery {
private boolean mResult;
public BooleanResult(boolean result) {
super();
mResult = result;
}
public boolean query() {
return mResult;
}
}
}

18
tests/robotests/src/com/android/settings/network/ims/MockVolteQueryImsState.java
View File

@@ -27,9 +27,9 @@ import com.android.ims.ImsManager;
*/ */
public class MockVolteQueryImsState extends VolteQueryImsState { public class MockVolteQueryImsState extends VolteQueryImsState {
private ImsQuery mIsTtyOnVolteEnabled; private Boolean mIsTtyOnVolteEnabled;
private ImsQuery mIsProvisionedOnDevice; private Boolean mIsProvisionedOnDevice;
private ImsQuery mIsEnabledByUser; private Boolean mIsEnabledByUser;
/** /**
* Constructor * Constructor
@@ -46,11 +46,11 @@ public class MockVolteQueryImsState extends VolteQueryImsState {
} }
public void setIsTtyOnVolteEnabled(boolean enabled) { public void setIsTtyOnVolteEnabled(boolean enabled) {
mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled); mIsTtyOnVolteEnabled = enabled;
} }
@Override @Override
ImsQuery isTtyOnVolteEnabled(int subId) { boolean isTtyOnVolteEnabled(int subId) {
if (mIsTtyOnVolteEnabled != null) { if (mIsTtyOnVolteEnabled != null) {
return mIsTtyOnVolteEnabled; return mIsTtyOnVolteEnabled;
} }
@@ -58,11 +58,11 @@ public class MockVolteQueryImsState extends VolteQueryImsState {
} }
public void setIsProvisionedOnDevice(boolean isProvisioned) { public void setIsProvisionedOnDevice(boolean isProvisioned) {
mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned); mIsProvisionedOnDevice = isProvisioned;
} }
@Override @Override
ImsQuery isProvisionedOnDevice(int subId) { boolean isProvisionedOnDevice(int subId) {
if (mIsProvisionedOnDevice != null) { if (mIsProvisionedOnDevice != null) {
return mIsProvisionedOnDevice; return mIsProvisionedOnDevice;
} }
@@ -70,11 +70,11 @@ public class MockVolteQueryImsState extends VolteQueryImsState {
} }
public void setIsEnabledByUser(boolean enabled) { public void setIsEnabledByUser(boolean enabled) {
mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled); mIsEnabledByUser = enabled;
} }
@Override @Override
ImsQuery isEnabledByUser(int subId) { boolean isEnabledByUser(int subId) {
if (mIsEnabledByUser != null) { if (mIsEnabledByUser != null) {
return mIsEnabledByUser; return mIsEnabledByUser;
} }

18
tests/robotests/src/com/android/settings/network/ims/MockVtQueryImsState.java
View File

@@ -26,9 +26,9 @@ import com.android.ims.ImsManager;
*/ */
public class MockVtQueryImsState extends VtQueryImsState { public class MockVtQueryImsState extends VtQueryImsState {
private ImsQuery mIsTtyOnVolteEnabled; private Boolean mIsTtyOnVolteEnabled;
private ImsQuery mIsProvisionedOnDevice; private Boolean mIsProvisionedOnDevice;
private ImsQuery mIsEnabledByUser; private Boolean mIsEnabledByUser;
/** /**
* Constructor * Constructor
@@ -45,11 +45,11 @@ public class MockVtQueryImsState extends VtQueryImsState {
} }
public void setIsTtyOnVolteEnabled(boolean enabled) { public void setIsTtyOnVolteEnabled(boolean enabled) {
mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled); mIsTtyOnVolteEnabled = enabled;
} }
@Override @Override
ImsQuery isTtyOnVolteEnabled(int subId) { boolean isTtyOnVolteEnabled(int subId) {
if (mIsTtyOnVolteEnabled != null) { if (mIsTtyOnVolteEnabled != null) {
return mIsTtyOnVolteEnabled; return mIsTtyOnVolteEnabled;
} }
@@ -57,11 +57,11 @@ public class MockVtQueryImsState extends VtQueryImsState {
} }
public void setIsProvisionedOnDevice(boolean isProvisioned) { public void setIsProvisionedOnDevice(boolean isProvisioned) {
mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned); mIsProvisionedOnDevice = isProvisioned;
} }
@Override @Override
ImsQuery isProvisionedOnDevice(int subId) { boolean isProvisionedOnDevice(int subId) {
if (mIsProvisionedOnDevice != null) { if (mIsProvisionedOnDevice != null) {
return mIsProvisionedOnDevice; return mIsProvisionedOnDevice;
} }
@@ -69,11 +69,11 @@ public class MockVtQueryImsState extends VtQueryImsState {
} }
public void setIsEnabledByUser(boolean enabled) { public void setIsEnabledByUser(boolean enabled) {
mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled); mIsEnabledByUser = enabled;
} }
@Override @Override
ImsQuery isEnabledByUser(int subId) { boolean isEnabledByUser(int subId) {
if (mIsEnabledByUser != null) { if (mIsEnabledByUser != null) {
return mIsEnabledByUser; return mIsEnabledByUser;
} }

18
tests/robotests/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java
View File

@@ -26,9 +26,9 @@ import com.android.ims.ImsManager;
*/ */
public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState { public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
private ImsQuery mIsTtyOnVolteEnabled; private Boolean mIsTtyOnVolteEnabled;
private ImsQuery mIsProvisionedOnDevice; private Boolean mIsProvisionedOnDevice;
private ImsQuery mIsEnabledByUser; private Boolean mIsEnabledByUser;
/** /**
* Constructor * Constructor
@@ -45,11 +45,11 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
} }
public void setIsTtyOnVolteEnabled(boolean enabled) { public void setIsTtyOnVolteEnabled(boolean enabled) {
mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled); mIsTtyOnVolteEnabled = enabled;
} }
@Override @Override
ImsQuery isTtyOnVolteEnabled(int subId) { boolean isTtyOnVolteEnabled(int subId) {
if (mIsTtyOnVolteEnabled != null) { if (mIsTtyOnVolteEnabled != null) {
return mIsTtyOnVolteEnabled; return mIsTtyOnVolteEnabled;
} }
@@ -57,11 +57,11 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
} }
public void setIsProvisionedOnDevice(boolean isProvisioned) { public void setIsProvisionedOnDevice(boolean isProvisioned) {
mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned); mIsProvisionedOnDevice = isProvisioned;
} }
@Override @Override
ImsQuery isProvisionedOnDevice(int subId) { boolean isProvisionedOnDevice(int subId) {
if (mIsProvisionedOnDevice != null) { if (mIsProvisionedOnDevice != null) {
return mIsProvisionedOnDevice; return mIsProvisionedOnDevice;
} }
@@ -69,11 +69,11 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
} }
public void setIsEnabledByUser(boolean enabled) { public void setIsEnabledByUser(boolean enabled) {
mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled); mIsEnabledByUser = enabled;
} }
@Override @Override
ImsQuery isEnabledByUser(int subId) { boolean isEnabledByUser(int subId) {
if (mIsEnabledByUser != null) { if (mIsEnabledByUser != null) {
return mIsEnabledByUser; return mIsEnabledByUser;
} }