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

Commit 7ca36d89 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12742097 from 532b0220 to 25Q1-release 

Change-Id: I271d9f3c206b041f94f4cae674494385a20bfe7d
parents a30deff0 532b0220

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

+2 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,8 @@ public class CallAudioRouteController implements CallAudioRouteAdapter { 
            mStatusBarNotifier.notifySpeakerphone(mCallsManager.hasAnyCalls());

        } else {

            if (mSpeakerDockRoute != null && getCallSupportedRoutes().contains(mSpeakerDockRoute)

                    && mSpeakerDockRoute.getType() == AudioRoute.TYPE_SPEAKER) {

                    && mSpeakerDockRoute.getType() == AudioRoute.TYPE_SPEAKER

                    && mCurrentRoute.getType() != AudioRoute.TYPE_SPEAKER) {

                routeTo(mIsActive, mSpeakerDockRoute);

                // Since the route switching triggered by this message, we need to manually send it

                // again so that we won't stuck in the pending route

src/com/android/server/telecom/metrics/ApiStats.java

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ public class ApiStats extends TelecomPulledAtom { 
            Arrays.stream(mPulledAtoms.telecomApiStats).forEach(v -> data.add(

                    TelecomStatsLog.buildStatsEvent(getTag(),

                            v.getApiName(), v.getUid(), v.getApiResult(), v.getCount())));

            mApiStatsMap.clear();

            onAggregate();

            return StatsManager.PULL_SUCCESS;

        } else {

            return StatsManager.PULL_SKIP;

src/com/android/server/telecom/metrics/AudioRouteStats.java

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ public class AudioRouteStats extends TelecomPulledAtom { 
                    TelecomStatsLog.buildStatsEvent(getTag(),

                            v.getCallAudioRouteSource(), v.getCallAudioRouteDest(),

                            v.getSuccess(), v.getRevert(), v.getCount(), v.getAverageLatencyMs())));

            mAudioRouteStatsMap.clear();

            onAggregate();

            return StatsManager.PULL_SUCCESS;

        } else {

            return StatsManager.PULL_SKIP;

src/com/android/server/telecom/metrics/CallStats.java

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public class CallStats extends TelecomPulledAtom { 
                            v.getCallDirection(), v.getExternalCall(), v.getEmergencyCall(),

                            v.getMultipleAudioAvailable(), v.getAccountType(), v.getUid(),

                            v.getCount(), v.getAverageDurationMs())));

            mCallStatsMap.clear();

            onAggregate();

            return StatsManager.PULL_SUCCESS;

        } else {

            return StatsManager.PULL_SKIP;

src/com/android/server/telecom/metrics/ErrorStats.java

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ public class ErrorStats extends TelecomPulledAtom { 
            Arrays.stream(mPulledAtoms.telecomErrorStats).forEach(v -> data.add(

                    TelecomStatsLog.buildStatsEvent(getTag(),

                            v.getSubmodule(), v.getError(), v.getCount())));

            mErrorStatsMap.clear();

            onAggregate();

            return StatsManager.PULL_SUCCESS;

        } else {

            return StatsManager.PULL_SKIP;