| commit | 0c6fe60ca78733434aef0f3765b30878337e5c1a | [log] [tgz] |
|---|---|---|
| author | Shuo Qian <shuoq@google.com> | Sat Nov 09 01:13:38 2019 +0000 |
| committer | sqian <shuoq@google.com> | Fri Nov 08 17:29:11 2019 -0800 |
| tree | 2a28481f5317e9bafaab19bd9d2d891cf626d3e3 | |
| parent | 838783222f82a0c58bf2fea071bdb4d98e5c8709 [diff] |
Change to getSubscriptionId Test: build Bug: 144097052 Change-Id: I9a20d969c40a7dc7255facaa3860fbaefd0bf8cd
diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java index 17b70da..72c06a3 100644 --- a/src/com/android/server/telecom/CreateConnectionProcessor.java +++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -103,7 +103,7 @@ if (manager == null) { return SubscriptionManager.INVALID_SUBSCRIPTION_ID; } - return manager.getSubIdForPhoneAccountHandle(account.getAccountHandle()); + return manager.getSubscriptionId(account.getAccountHandle()); } @Override
diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java index 7dede8c..22568f1 100644 --- a/src/com/android/server/telecom/PhoneAccountRegistrar.java +++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -195,7 +195,7 @@ if (account != null && account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) { TelephonyManager tm = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); - return tm.getSubIdForPhoneAccountHandle(accountHandle); + return tm.getSubscriptionId(accountHandle); } return SubscriptionManager.INVALID_SUBSCRIPTION_ID; }
diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java index ed4e588..dcd0607 100644 --- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java +++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
@@ -502,7 +502,7 @@ // Used in CreateConnectionProcessor to rank emergency numbers by viability. // For the test, make them all equal to INVALID so that the preferred PhoneAccount will be // chosen. - when(mTelephonyManager.getSubIdForPhoneAccountHandle(any())).thenReturn( + when(mTelephonyManager.getSubscriptionId(any())).thenReturn( SubscriptionManager.INVALID_SUBSCRIPTION_ID); when(mTelephonyManager.getNetworkOperatorName()).thenReturn("label1");