Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9780be3d authored Oct 06, 2020 by Treehugger Robot Committed by Gerrit Code Review Oct 06, 2020

Merge "Require READ_PHONE_STATE for getSmsCapacityOnIcc() instead"

parents 240d5ece 42fae81a

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

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1365,10 +1365,12 @@ public class IccSmsInterfaceManager {
	0L /* messageId */);		0L /* messageId */);
	}		}

	public int getSmsCapacityOnIcc() {		public int getSmsCapacityOnIcc(String callingPackage, String callingFeatureId) {
	mContext.enforceCallingOrSelfPermission(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,		mContext, mPhone.getSubId(), callingPackage, callingFeatureId,
	"getSmsCapacityOnIcc");		"getSmsCapacityOnIcc")) {
			return 0;
			}

	int numberOnIcc = 0;		int numberOnIcc = 0;
	if (mPhone.getIccRecordsLoaded()) {		if (mPhone.getIccRecordsLoaded()) {

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -816,7 +816,7 @@ public class SmsController extends ISmsImplBase {
	IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);

	if (iccSmsIntMgr != null ) {		if (iccSmsIntMgr != null ) {
	return iccSmsIntMgr.getSmsCapacityOnIcc();		return iccSmsIntMgr.getSmsCapacityOnIcc(getCallingPackage(), null);
	} else {		} else {
	Rlog.e(LOG_TAG, "iccSmsIntMgr is null for " + " subId: " + subId);		Rlog.e(LOG_TAG, "iccSmsIntMgr is null for " + " subId: " + subId);
	return 0;		return 0;