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

Commit 92016288 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Remove/Modify some logs in SubscriptionController to prevent log flood." am: 037c07ef 

am: 9fc6d5e3

Change-Id: Id864f5d115578be193f1781b9f302b427034d658
parents 76149c0c 9fc6d5e3

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

+2 −4
Original line number Diff line number Diff line
@@ -597,8 +597,6 @@ public class SubscriptionController extends ISub.Stub { 
     */

    @Override

    public int getActiveSubInfoCount(String callingPackage) {

        if (DBG) logd("[getActiveSubInfoCount]+");



        if (!canReadPhoneState(callingPackage, "getActiveSubInfoCount")) {

            return 0;

        }
@@ -609,10 +607,10 @@ public class SubscriptionController extends ISub.Stub { 
            List<SubscriptionInfo> records = getActiveSubscriptionInfoList(

                    mContext.getOpPackageName());

            if (records == null) {

                if (DBG) logd("[getActiveSubInfoCount] records null");

                if (VDBG) logd("[getActiveSubInfoCount] records null");

                return 0;

            }

            if (DBG) logd("[getActiveSubInfoCount]- count: " + records.size());

            if (VDBG) logd("[getActiveSubInfoCount]- count: " + records.size());

            return records.size();

        } finally {

            Binder.restoreCallingIdentity(identity);