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

[Settings] Avoid from accessing IMS with invalid subscription id

Browse Source 
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
This commit is contained in:
Bonian Chen
2020-03-20 13:31:35 +08:00
parent b33c16cacb
commit 4a49f426fb
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,9 @@ abstract class ImsQueryController {
@VisibleForTesting
boolean isProvisionedOnDevice(int subId) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
return false;
}
return (new ImsQueryProvisioningStat(subId, mCapability, mTech)).query();
}

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

@@ -60,6 +60,9 @@ public class VolteQueryImsState extends ImsQueryController {
*/
@VisibleForTesting
boolean isEnabledByUser(int subId) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
return false;
}
return (new ImsQueryEnhanced4gLteModeUserSetting(subId)).query();
}
@@ -75,6 +78,9 @@ public class VolteQueryImsState extends ImsQueryController {
* @return true when VoLTE has been enabled, otherwise false
*/
public boolean isVoLteProvisioned() {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false;
}
if (!isProvisionedOnDevice(mSubId)) {
return false;
}
@@ -92,6 +98,9 @@ public class VolteQueryImsState extends ImsQueryController {
* @return true when VoLTE can be performed, otherwise false
*/
public boolean isReadyToVoLte() {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false;
}
return isVoLteProvisioned()
&& MobileNetworkUtils.isImsServiceStateReady(getImsManager(mSubId));
}

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

@@ -59,6 +59,9 @@ public class VtQueryImsState extends ImsQueryController {
*/
@VisibleForTesting
boolean isEnabledByUser(int subId) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
return false;
}
return (new ImsQueryVtUserSetting(subId)).query();
}

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

@@ -56,6 +56,9 @@ public class WifiCallingQueryImsState extends ImsQueryController {
*/
@VisibleForTesting
boolean isEnabledByUser(int subId) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
return false;
}
return (new ImsQueryWfcUserSetting(subId)).query();
}
@@ -71,6 +74,9 @@ public class WifiCallingQueryImsState extends ImsQueryController {
* @return true when Wifi Calling has been enabled, otherwise false
*/
public boolean isWifiCallingProvisioned() {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false;
}
final ImsManager imsManager = getImsManager(mSubId);
if (imsManager == null) {
return false;
@@ -86,6 +92,9 @@ public class WifiCallingQueryImsState extends ImsQueryController {
* @return true when Wifi Calling can be performed, otherwise false
*/
public boolean isReadyToWifiCalling() {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false;
}
return isWifiCallingProvisioned()
&& MobileNetworkUtils.isImsServiceStateReady(getImsManager(mSubId));
}