Merge "Remove/Modify some logs in SubscriptionController to prevent log flood." am: 037c07ef01 (92016288) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -597,8 +597,6 @@ public class SubscriptionController extends ISub.Stub {
	*/		*/
	@Override		@Override
	public int getActiveSubInfoCount(String callingPackage) {		public int getActiveSubInfoCount(String callingPackage) {
	if (DBG) logd("[getActiveSubInfoCount]+");

	if (!canReadPhoneState(callingPackage, "getActiveSubInfoCount")) {		if (!canReadPhoneState(callingPackage, "getActiveSubInfoCount")) {
	return 0;		return 0;
	}		}
	@@ -609,10 +607,10 @@ public class SubscriptionController extends ISub.Stub {
	List<SubscriptionInfo> records = getActiveSubscriptionInfoList(		List<SubscriptionInfo> records = getActiveSubscriptionInfoList(
	mContext.getOpPackageName());		mContext.getOpPackageName());
	if (records == null) {		if (records == null) {
	if (DBG) logd("[getActiveSubInfoCount] records null");		if (VDBG) logd("[getActiveSubInfoCount] records null");
	return 0;		return 0;
	}		}
	if (DBG) logd("[getActiveSubInfoCount]- count: " + records.size());		if (VDBG) logd("[getActiveSubInfoCount]- count: " + records.size());
	return records.size();		return records.size();
	} finally {		} finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);