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

Commit 1c1f4e6a authored by Thomas Stuart's avatar Thomas Stuart Committed by Automerger Merge Worker
Browse files

Merge "fix log spewing coming from Telecom#LogUtils" into tm-dev am: 456561b8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/17961243



Change-Id: I12ec452973c7cfeed8f7d78a2b5a8804851613de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8004aba 456561b8

src/com/android/server/telecom/LogUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -255,13 +255,14 @@ public class LogUtils { 
        EventManager.Loggable recordEntry = eventRecord.getRecordEntry();

        if (recordEntry instanceof Call) {

            Call callRecordEntry = (Call) recordEntry;

            android.telecom.Log.i(LOGUTILS_TAG, "EventRecord added as Call: " + callRecordEntry);

            Analytics.CallInfo callInfo = callRecordEntry.getAnalytics();

            if(callInfo != null) {

                callInfo.setCallEvents(eventRecord);

            } else {

                if(!android.telecom.Log.isUnitTestingEnabled()) {

                    android.telecom.Log.w(LOGUTILS_TAG, "Could not get Analytics CallInfo.");

                }

            }

        } else {

            android.telecom.Log.w(LOGUTILS_TAG, "Non-Call EventRecord Added.");

        }

tests/src/com/android/server/telecom/tests/ComponentContextFixture.java

+1 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import android.content.pm.ServiceInfo; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.hardware.SensorPrivacyManager;

import android.location.Country;

import android.location.CountryDetector;

import android.media.AudioDeviceInfo;

import android.media.AudioManager;
@@ -59,17 +58,14 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IInterface;

import android.os.PersistableBundle;

import android.os.PowerWhitelistManager;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.VibratorManager;

import android.permission.PermissionCheckerManager;

import android.telecom.CallAudioState;

import android.telecom.ConnectionService;

import android.telecom.Log;

import android.telecom.InCallService;

import android.telecom.PhoneAccount;

import android.telecom.TelecomManager;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;
@@ -664,6 +660,7 @@ public class ComponentContextFixture implements TestFixture<Context> { 
        // Make sure we do not hide PII during testing.

        Log.setTag("TelecomTEST");

        Log.setIsExtendedLoggingEnabled(true);

        Log.setUnitTestingEnabled(true);

        Log.VERBOSE = true;

    }

tests/src/com/android/server/telecom/tests/TelecomTestCase.java

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public abstract class TelecomTestCase { 
    public void setUp() throws Exception {

        Log.setTag(TESTING_TAG);

        Log.setIsExtendedLoggingEnabled(true);

        Log.setUnitTestingEnabled(true);

        mMockitoHelper.setUp(InstrumentationRegistry.getContext(), getClass());

        mComponentContextFixture = new ComponentContextFixture();

        mContext = mComponentContextFixture.getTestDouble().getApplicationContext();