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

Commit 8f6603f7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6570104 from 75c895d0 to rvc-release 

Change-Id: Ie33bfa844e9b1bb3e5022e8900760a193d8c0343
parents 71751323 75c895d0

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

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    }



    public void notifyDisconnectCause(Phone sender, int cause, int preciseCause) {

        mTelephonyRegistryMgr.notifyDisconnectCause(sender.getSubId(), sender.getPhoneId(), cause,

        mTelephonyRegistryMgr.notifyDisconnectCause(sender.getPhoneId(), sender.getSubId(), cause,

                preciseCause);

    }

src/java/com/android/internal/telephony/metrics/MetricsCollector.java

+2 −2
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ import android.content.Context; 
import android.util.StatsEvent;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.BackgroundThread;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.nano.PersistAtomsProto.RawVoiceCallRatUsage;

import com.android.internal.telephony.nano.PersistAtomsProto.VoiceCallSession;

import com.android.internal.util.ConcurrentUtils;

import com.android.telephony.Rlog;



import java.util.Arrays;
@@ -210,7 +210,7 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 


    /** Registers a pulled atom ID {@code atomId} with optional {@code policy} for pulling. */

    private void registerAtom(int atomId, @Nullable StatsManager.PullAtomMetadata policy) {

        mStatsManager.setPullAtomCallback(atomId, policy, BackgroundThread.getExecutor(), this);

        mStatsManager.setPullAtomCallback(atomId, policy, ConcurrentUtils.DIRECT_EXECUTOR, this);

    }



    private static StatsEvent buildStatsEvent(RawVoiceCallRatUsage usage) {

tests/telephonytests/src/com/android/internal/telephony/DefaultPhoneNotifierTest.java

+8 −6
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import java.util.Collections; 
import java.util.List;



public class DefaultPhoneNotifierTest extends TelephonyTest {

    private static final int PHONE_ID = 1;

    private static final int SUB_ID = 0;



    private DefaultPhoneNotifier mDefaultPhoneNotifierUT;

    @Mock
@@ -152,17 +154,17 @@ public class DefaultPhoneNotifierTest extends TelephonyTest { 


    @Test @SmallTest

    public void testNotifyDisconnectCause() throws Exception {

        doReturn(1).when(mPhone).getPhoneId();

        doReturn(0).when(mPhone).getSubId();

        doReturn(PHONE_ID).when(mPhone).getPhoneId();

        doReturn(SUB_ID).when(mPhone).getSubId();

        mDefaultPhoneNotifierUT.notifyDisconnectCause(mPhone, DisconnectCause.NOT_VALID,

                PreciseDisconnectCause.FDN_BLOCKED);

        verify(mTelephonyRegistryManager).notifyDisconnectCause(0, 1, DisconnectCause.NOT_VALID,

                PreciseDisconnectCause.FDN_BLOCKED);

        verify(mTelephonyRegistryManager).notifyDisconnectCause(PHONE_ID, SUB_ID,

                DisconnectCause.NOT_VALID, PreciseDisconnectCause.FDN_BLOCKED);



        mDefaultPhoneNotifierUT.notifyDisconnectCause(mPhone, DisconnectCause.LOCAL,

                PreciseDisconnectCause.CHANNEL_NOT_AVAIL);

        verify(mTelephonyRegistryManager).notifyDisconnectCause(0, 1, DisconnectCause.LOCAL,

                PreciseDisconnectCause.CHANNEL_NOT_AVAIL);

        verify(mTelephonyRegistryManager).notifyDisconnectCause(PHONE_ID, SUB_ID,

                DisconnectCause.LOCAL, PreciseDisconnectCause.CHANNEL_NOT_AVAIL);

    }



    @Test @SmallTest