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

Commit 89945f54 authored by Ayush Sharma's avatar Ayush Sharma
Browse files

Fix logic to get default dialer/SMS app 

Bug: 269450111
Test: atest android.devicepolicy.cts.ManagedSubscriptionsPolicyTest
Change-Id: I0b9967ea91f9fda0781b13104b948cec1df58b3c
parent 2057a5de

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+18 −15
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ import android.security.keystore.AttestationUtils; 
import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.ParcelableKeyGenParameterSpec;

import android.stats.devicepolicy.DevicePolicyEnums;

import android.telecom.TelecomManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;
@@ -3533,26 +3534,21 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                userId == UserHandle.USER_SYSTEM ? UserHandle.USER_ALL : userId);

        updatePermissionPolicyCache(userId);

        updateAdminCanGrantSensorsPermissionCache(userId);

        final List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs;

        boolean isManagedSubscription;













        final List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs;















        synchronized (getLockObject()) {















            ActiveAdmin owner = getDeviceOrProfileOwnerAdminLocked(userId);















            preferentialNetworkServiceConfigs = owner != null















                    ? owner.mPreferentialNetworkServiceConfigs















                    : List.of(PreferentialNetworkServiceConfig.DEFAULT);

























            isManagedSubscription = owner != null && owner.mManagedSubscriptionsPolicy != null













                    && owner.mManagedSubscriptionsPolicy.getPolicyType()













                    == ManagedSubscriptionsPolicy.TYPE_ALL_MANAGED_SUBSCRIPTIONS;















        }















        updateNetworkPreferenceForUser(userId, preferentialNetworkServiceConfigs);



























        if (isManagedSubscription) {













            String defaultDialerPackageName = getDefaultRoleHolderPackageName(













                    com.android.internal.R.string.config_defaultDialer);













            String defaultSmsPackageName = getDefaultRoleHolderPackageName(













                    com.android.internal.R.string.config_defaultSms);













        if (isProfileOwnerOfOrganizationOwnedDevice(userId)













                && getManagedSubscriptionsPolicy().getPolicyType()













                == ManagedSubscriptionsPolicy.TYPE_ALL_MANAGED_SUBSCRIPTIONS) {













            String defaultDialerPackageName = getOemDefaultDialerPackage();













            String defaultSmsPackageName = getOemDefaultSmsPackage();















            updateDialerAndSmsManagedShortcutsOverrideCache(defaultDialerPackageName,















                    defaultSmsPackageName);















        }










@@ -22780,10 +22776,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {



























    private void installOemDefaultDialerAndSmsApp(int targetUserId) {















        try {













            String defaultDialerPackageName = getDefaultRoleHolderPackageName(













                    com.android.internal.R.string.config_defaultDialer);













            String defaultSmsPackageName = getDefaultRoleHolderPackageName(













                    com.android.internal.R.string.config_defaultSms);













            String defaultDialerPackageName = getOemDefaultDialerPackage();













            String defaultSmsPackageName = getOemDefaultSmsPackage();





























            if (defaultDialerPackageName != null) {















                mIPackageManager.installExistingPackageAsUser(defaultDialerPackageName,









@@ -22809,6 +22803,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        }















    }



























    private String getOemDefaultDialerPackage() {













        TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);













        return telecomManager.getSystemDialerPackage();













    }

























    private String getOemDefaultSmsPackage() {













        return mContext.getString(R.string.config_defaultSms);













    }



























    private void updateDialerAndSmsManagedShortcutsOverrideCache(















            String defaultDialerPackageName, String defaultSmsPackageName) {