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

Commit e55f5159 authored by Evan Laird's avatar Evan Laird
Browse files

[Networking] Add [SubscriptionModel.provisioningClass] field for tracking 

This will enable us to filter out certain subscriptions based on
provisioning class.

Test: all tests in statusbar/pipeline
Flag: NONE
Bug: 300018361
Change-Id: I6ed7a94bdc0de5c9238b2f1b20452e9fab3c0fc1
parent a894e1d8

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/SubscriptionModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.pipeline.mobile.data.model



import android.os.ParcelUuid

import android.telephony.SubscriptionManager.ProfileClass



/**

 * SystemUI representation of [SubscriptionInfo]. Currently we only use two fields on the
@@ -37,4 +38,7 @@ data class SubscriptionModel( 


    /** Text representing the name for this connection */

    val carrierName: String,



    /** Allow us to filter out PROVISIONING profiles. See [SubscriptionInfo.getProfileClass] */

    @ProfileClass val profileClass: Int

)

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository.demo 


import android.content.Context

import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID

import android.telephony.SubscriptionManager.PROFILE_CLASS_UNSET

import android.util.Log

import com.android.settingslib.SignalIcon

import com.android.settingslib.mobile.MobileMappings
@@ -96,6 +97,7 @@ constructor( 
                    subscriptionId = subId,

                    isOpportunistic = false,

                    carrierName = DEFAULT_CARRIER_NAME,

                    profileClass = PROFILE_CLASS_UNSET,

                )

                .also { subscriptionInfoCache[subId] = it }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ constructor( 
            isOpportunistic = isOpportunistic,

            groupUuid = groupUuid,

            carrierName = carrierName.toString(),

            profileClass = profileClass,

        )



    companion object {

packages/SystemUI/tests/src/com/android/systemui/shade/ui/viewmodel/ShadeHeaderViewModelTest.kt

+3 −0
Original line number Diff line number Diff line 
package com.android.systemui.shade.ui.viewmodel



import android.telephony.SubscriptionManager.PROFILE_CLASS_UNSET

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase
@@ -151,12 +152,14 @@ class ShadeHeaderViewModelTest : SysuiTestCase() { 
                subscriptionId = 1,

                isOpportunistic = false,

                carrierName = "Carrier 1",

                profileClass = PROFILE_CLASS_UNSET,

            )

        private val SUB_2 =

            SubscriptionModel(

                subscriptionId = 2,

                isOpportunistic = false,

                carrierName = "Carrier 2",

                profileClass = PROFILE_CLASS_UNSET,

            )

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository 


import android.telephony.SubscriptionInfo

import android.telephony.SubscriptionManager

import android.telephony.SubscriptionManager.PROFILE_CLASS_UNSET

import android.telephony.TelephonyManager

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase
@@ -249,11 +250,13 @@ class MobileRepositorySwitcherTest : SysuiTestCase() { 
            mock<SubscriptionInfo>().also {

                whenever(it.subscriptionId).thenReturn(SUB_1_ID)

                whenever(it.carrierName).thenReturn(SUB_1_NAME)

                whenever(it.profileClass).thenReturn(PROFILE_CLASS_UNSET)

            }

        private val MODEL_1 =

            SubscriptionModel(

                subscriptionId = SUB_1_ID,

                carrierName = SUB_1_NAME,

                profileClass = PROFILE_CLASS_UNSET,

            )



        private const val SUB_2_ID = 2
@@ -262,11 +265,13 @@ class MobileRepositorySwitcherTest : SysuiTestCase() { 
            mock<SubscriptionInfo>().also {

                whenever(it.subscriptionId).thenReturn(SUB_2_ID)

                whenever(it.carrierName).thenReturn(SUB_2_NAME)

                whenever(it.profileClass).thenReturn(PROFILE_CLASS_UNSET)

            }

        private val MODEL_2 =

            SubscriptionModel(

                subscriptionId = SUB_2_ID,

                carrierName = SUB_2_NAME,

                profileClass = PROFILE_CLASS_UNSET,

            )

    }

}