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

Commit 019800df authored by Nagendra Prasad Nagarle Basavaraju's avatar Nagendra Prasad Nagarle Basavaraju Committed by Android (Google) Code Review
Browse files

Merge "[Flagging Addition] Add Flagging feature for Telephony Analytics Enabling" into main

parents 680e35a7 b0910be8

flags/misc.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -56,3 +56,10 @@ flag { 
  description: "Load default data subid on create in PhoneGlobals."

  bug: "310591561"

}



flag {

  name: "enable_telephony_analytics"

  namespace: "telephony"

  description: "Enable Telephony Analytics information of Service State , Sms and Call scenarios"

  bug: "309896524"

}

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

+1 −6
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

        }

        //Initialize Telephony Analytics

        if (isTelephonyAnalyticsEnabled()) {

        if (mFeatureFlags.enableTelephonyAnalytics()) {

            mTelephonyAnalytics = new TelephonyAnalytics(this);

        }

    }
@@ -4780,11 +4780,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        return mTelephonyAnalytics;

    }



    public boolean isTelephonyAnalyticsEnabled() {

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.telephony_analytics_switch);

    }



    /** @hide */

    public CarrierPrivilegesTracker getCarrierPrivilegesTracker() {

        return null;

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

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.Mockito;



import java.util.ArrayList;

import java.util.Arrays;
@@ -67,6 +68,7 @@ public final class CellBroadcastConfigTrackerTest extends TelephonyTest { 
    @Before

    public void setUp() throws Exception {

        super.setUp(getClass().getSimpleName());

        mFeatureFlags = Mockito.mock(FeatureFlags.class);

        mSpyCi = spy(mSimulatedCommands);

        mPhone = new GsmCdmaPhone(mContext, mSpyCi, mNotifier, true, 0,

            PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory, (c, p) -> mImsManager,

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmMmiCodeTest.java

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;



import java.util.ArrayList;

import java.util.concurrent.Executor;
@@ -65,6 +66,7 @@ public class GsmMmiCodeTest extends TelephonyTest { 
    @Before

    public void setUp() throws Exception {

        super.setUp(getClass().getSimpleName());

        mFeatureFlags = Mockito.mock(FeatureFlags.class);

        doReturn(mExecutor).when(mContext).getMainExecutor();

        mGsmCdmaPhoneUT = new GsmCdmaPhone(mContext, mSimulatedCommands, mNotifier, true, 0,

                PhoneConstants.PHONE_TYPE_GSM, mTelephonyComponentFactory, (c, p) -> mImsManager,