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

Commit 3f623c52 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up flag" into main

parents 92621a58 46168e03

flags/data.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ flag { 
  bug:"286171724"

}



# OWNER=jackyu TARGET=24Q4

flag {

  name: "dds_callback"

  namespace: "telephony"

  description: "Adding new callback when DDS changed"

  bug:"353723350"

}



# OWNER=jackyu TARGET=25Q2

flag {

  name: "oem_paid_private"

src/java/com/android/internal/telephony/data/PhoneSwitcher.java

+8 −14
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneConfigurationManager;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.RadioConfig;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.data.DataNetworkController.NetworkRequestList;

import com.android.internal.telephony.data.DataSettingsManager.DataSettingsManagerCallback;

import com.android.internal.telephony.flags.FeatureFlags;
@@ -627,10 +626,6 @@ public class PhoneSwitcher extends Handler { 
        };

        mAutoDataSwitchController = new AutoDataSwitchController(context, looper, this,

                mFlags, mAutoDataSwitchCallback);

        if (!mFlags.ddsCallback()) {

            mContext.registerReceiver(mDefaultDataChangedReceiver,

                    new IntentFilter(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED));

        } else {

        mSubscriptionManagerService.registerCallback(new SubscriptionManagerServiceCallback(

                this::post) {

            @Override
@@ -639,7 +634,6 @@ public class PhoneSwitcher extends Handler { 
                        DataSwitch.Reason.DATA_SWITCH_REASON_MANUAL);

            }

        });

        }



        PhoneConfigurationManager.registerForMultiSimConfigChange(

                this, EVENT_MULTI_SIM_CONFIG_CHANGED, null);

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+7 −11
Original line number Diff line number Diff line
@@ -638,12 +638,10 @@ public class SubscriptionManagerService extends ISub.Stub { 
        // Broadcast sub Id on service initialized.

        broadcastSubId(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED,

                getDefaultDataSubId());

        if (mFeatureFlags.ddsCallback()) {

        mSubscriptionManagerServiceCallbacks.forEach(

                callback -> callback.invokeFromExecutor(

                        () -> callback.onDefaultDataSubscriptionChanged(

                                getDefaultDataSubId())));

        }



        broadcastSubId(TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED,

                getDefaultVoiceSubId());
@@ -3249,11 +3247,9 @@ public class SubscriptionManagerService extends ISub.Stub { 


                broadcastSubId(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED,

                        subId);

                if (mFeatureFlags.ddsCallback()) {

                mSubscriptionManagerServiceCallbacks.forEach(

                        callback -> callback.invokeFromExecutor(

                                () -> callback.onDefaultDataSubscriptionChanged(subId)));

                }



                updateDefaultSubId();

            }

tests/telephonytests/src/com/android/internal/telephony/data/PhoneSwitcherTest.java

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ public class PhoneSwitcherTest extends TelephonyTest { 
        mServiceManagerMockedServices.put("isub", mIBinder);



        doReturn(mTelephonyDisplayInfo).when(mDisplayInfoController).getTelephonyDisplayInfo();

        doReturn(true).when(mFeatureFlags).ddsCallback();

    }



    @After

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+0 −2
Original line number Diff line number Diff line
@@ -224,8 +224,6 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        ((MockContentResolver) mContext.getContentResolver()).addProvider(

                Telephony.Carriers.CONTENT_URI.getAuthority(), mSubscriptionProvider);



        doReturn(true).when(mFeatureFlags).ddsCallback();



        mSubscriptionManagerServiceUT = new SubscriptionManagerService(mContext, Looper.myLooper(),

                mFeatureFlags);