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

Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId

Browse Source 
Bug: 140908357
Test: build
Change-Id: Idaa206c7659717a269738c0121a31d957f7d90d0
This commit is contained in:
Malcolm Chen
2019-12-12 16:23:33 -08:00
parent d8c711d891
commit 26e5dbdbfd
9 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -55,6 +55,7 @@ import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.widget.SwitchBar;
@@ -246,7 +247,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
@VisibleForTesting
ImsManager getImsManager() {
return ImsManager.getInstance(getActivity(), SubscriptionManager.getPhoneId(mSubId));
return ImsManager.getInstance(getActivity(),
SubscriptionUtil.getPhoneId(getActivity(), mSubId));
}
@VisibleForTesting

3
src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
View File

@@ -46,6 +46,7 @@ import com.android.ims.ImsConfig;
import com.android.ims.ImsManager;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.slices.SliceBroadcastReceiver;
@@ -364,7 +365,7 @@ public class WifiCallingSliceHelper {
}
protected ImsManager getImsManager(int subId) {
return ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(subId));
return ImsManager.getInstance(mContext, SubscriptionUtil.getPhoneId(mContext, subId));
}
protected ImsMmTelManager getImsMmTelManager(int subId) {