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

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

Merge "Clean up 24Q3 aconfig flag DATA_ONLY_CELLULAR_SERVICE" into main

parents 67a8ba3e fd1379d0

flags/subscription.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -19,15 +19,6 @@ flag { 
  bug: "296076674"

}



# OWNER=rambowang TARGET=24Q3

flag {

  name: "data_only_cellular_service"

  is_exported: true

  namespace: "telephony"

  description: "Supports customized cellular service capabilities per subscription."

  bug: "296097429"

}



# OWNER=hhshin TARGET=24Q3

flag {

  name: "support_psim_to_esim_conversion"

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

+2 −3
Original line number Diff line number Diff line
@@ -366,9 +366,8 @@ public class SimultaneousCallingTracker { 
            SubscriptionInfo subInfo =

                    SubscriptionManagerService.getInstance().getSubscriptionInfo(subId);



            if (mFeatureFlags.dataOnlyCellularService() &&

                    subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID && subInfo != null &&

                    subInfo.getServiceCapabilities()

            if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID && subInfo != null

                    && subInfo.getServiceCapabilities()

                            .contains(SubscriptionManager.SERVICE_CAPABILITY_VOICE)) {

                Log.v(LOG_TAG, "generateVoiceCapablePhoneMapBasedOnUserAssociation: adding "

                        + "phoneId = " + phone.getPhoneId());

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

+0 −3
Original line number Diff line number Diff line
@@ -2121,9 +2121,6 @@ public class SubscriptionDatabaseManager extends Handler { 
     * @param capabilities Service capabilities bitmasks

     */

    public void setServiceCapabilities(int subId, int capabilities) {

        if (!mFeatureFlags.dataOnlyCellularService()) {

            return;

        }

        writeDatabaseAndCacheHelper(subId, SimInfo.COLUMN_SERVICE_CAPABILITIES,

                capabilities, SubscriptionInfoInternal.Builder::setServiceCapabilities);

    }

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

+26 −28
Original line number Diff line number Diff line
@@ -1838,7 +1838,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
                    + " newSetting=" + SubscriptionManager.usageSettingToString(newUsageSetting));

        }



        if (mFeatureFlags.dataOnlyCellularService()) {

        final int[] servicesFromCarrierConfig =

                config.getIntArray(

                        CarrierConfigManager.KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY);
@@ -1870,7 +1869,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
            mSubscriptionDatabaseManager.setServiceCapabilities(subId, serviceBitmasks);

        }

    }

    }



    /**

     * Get all subscription info records from SIMs visible to the calling user that are inserted now

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

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ public class SimultaneousCallingTrackerTest extends TelephonyTest { 
                .getSubscriptionInfo(any(Integer.class));

        doReturn(RIL.RADIO_HAL_VERSION_2_2).when(mMockRadioConfigProxy).getVersion();

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

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

        mMockRegistryManager = mContext.getSystemService(TelephonyRegistryManager.class);

    }