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

Commit c9cff1c6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10421851 from 0260e643 to udc-qpr1-release 

Change-Id: I855af30959feefe740695f93970c6c725488e13a
parents 3ef543ca 0260e643

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.os.TelephonyServiceManager;

import android.os.TelephonyServiceManager;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;

import android.provider.Telephony.SimInfo;

import android.provider.Telephony.SimInfo;

import android.service.carrier.CarrierIdentifier;

import android.service.carrier.CarrierIdentifier;
@@ -3665,6 +3666,15 @@ public class SubscriptionManagerService extends ISub.Stub { 
                }

                }

            }

            }





            UserManager userManager = mContext.getSystemService(UserManager.class);

            if ((userManager != null)

                    && (userManager.isManagedProfile(userHandle.getIdentifier()))) {

                // For work profile, return subscriptions associated only with work profile

                return subscriptionsAssociatedWithUser;

            }



            // For all other profiles, if subscriptionsAssociatedWithUser is empty return all the

            // subscriptionsWithNoAssociation.

            return subscriptionsAssociatedWithUser.isEmpty() ?

            return subscriptionsAssociatedWithUser.isEmpty() ?

                    subscriptionsWithNoAssociation : subscriptionsAssociatedWithUser;

                    subscriptionsWithNoAssociation : subscriptionsAssociatedWithUser;

        } finally {

        } finally {

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -146,6 +146,8 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 




    private static final UserHandle FAKE_USER_HANDLE = new UserHandle(12);

    private static final UserHandle FAKE_USER_HANDLE = new UserHandle(12);





    private static final UserHandle FAKE_MANAGED_PROFILE_USER_HANDLE = new UserHandle(13);



    // mocked

    // mocked

    private SubscriptionManagerServiceCallback mMockedSubscriptionManagerServiceCallback;

    private SubscriptionManagerServiceCallback mMockedSubscriptionManagerServiceCallback;

    private EuiccController mEuiccController;

    private EuiccController mEuiccController;
@@ -212,6 +214,9 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        setIdentifierAccess(false);

        setIdentifierAccess(false);

        setPhoneNumberAccess(PackageManager.PERMISSION_DENIED);

        setPhoneNumberAccess(PackageManager.PERMISSION_DENIED);





        doReturn(true).when(mUserManager)

                .isManagedProfile(eq(FAKE_MANAGED_PROFILE_USER_HANDLE.getIdentifier()));



        logd("SubscriptionManagerServiceTest -Setup!");

        logd("SubscriptionManagerServiceTest -Setup!");

    }

    }
@@ -1081,6 +1086,13 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 




        assertThat(mSubscriptionManagerServiceUT.isSubscriptionAssociatedWithUser(1,

        assertThat(mSubscriptionManagerServiceUT.isSubscriptionAssociatedWithUser(1,

                FAKE_USER_HANDLE)).isEqualTo(true);

                FAKE_USER_HANDLE)).isEqualTo(true);



        // Work profile is not associated with any subscription

        associatedSubInfoList = mSubscriptionManagerServiceUT

                .getSubscriptionInfoListAssociatedWithUser(FAKE_MANAGED_PROFILE_USER_HANDLE);

        assertThat(associatedSubInfoList.size()).isEqualTo(0);

        assertThat(mSubscriptionManagerServiceUT.isSubscriptionAssociatedWithUser(1,

                FAKE_MANAGED_PROFILE_USER_HANDLE)).isEqualTo(false);

    }

    }





    @Test

    @Test