Merge "Fix a mistake caused by rebasing" (5dcca67d) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -551,9 +551,6 @@ public class SmsController extends ISmsImplBase {
	}		}
	}		}

	/**
	* Triggered by `adb shell dumpsys isms`
	*/
	@Override		@Override
	public String getSmscAddressFromIccEfForSubscriber(int subId, String callingPackage) {		public String getSmscAddressFromIccEfForSubscriber(int subId, String callingPackage) {
	IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
	@@ -579,6 +576,9 @@ public class SmsController extends ISmsImplBase {
	}		}
	}		}

			/**
			* Triggered by `adb shell dumpsys isms`
			*/
	@Override		@Override
	protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	if (!checkDumpPermission(mContext, LOG_TAG, pw)) {		if (!checkDumpPermission(mContext, LOG_TAG, pw)) {