Merge "MSIM: Define canConference() method in CallManager"

src/java/com/android/internal/telephony/CallManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -2200,4 +2200,8 @@ public class CallManager {
		return false;
		}

		public boolean canConference(Call heldCall, int subscription) {
		Rlog.e(LOG_TAG, " canConference for subscription not supported");
		return false;
		}
		}