aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-27 14:50:05 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-27 14:50:05 +0000
commit551e63a25455174ee5da8bf7d9439c4046ca8f38 (patch)
tree1343a07368deb3a742de8a228e3ab97f070b5ed1
parent9cc4fbdd6481ed744d319cbfa0150dfc6d44e725 (diff)
parent05a65e4026051dd8bec598fd50d40f4825ebf7b6 (diff)
downloadtelephony-oreo-m4-s1-release.tar.gz
Merge cherrypicks of [3134552, 3130583, 3131953, 3131954, 3131955, 3131956, 3131957, 3131958, 3131959, 3132062, 3132336, 3131074, 3133939, 3131024, 3131025, 3131026, 3130584, 3130879, 3130880] into oc-mr1-releaseandroid-vts-8.1_r3android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r2android-cts-8.1_r1android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1oreo-mr1-s1-releaseoreo-m4-s1-release
Change-Id: I1aef5d261605e55125347c191a77322552cca188
-rw-r--r--src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java
index 87b96d8b8b..c165b03e3b 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneBase.java
@@ -496,9 +496,6 @@ abstract class ImsPhoneBase extends Phone {
return false;
}
- public void saveClirSetting(int commandInterfaceCLIRMode) {
- }
-
@Override
public IccPhoneBookInterfaceManager getIccPhoneBookInterfaceManager(){
return null;