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

Commit bdbf4ad5 authored by Oliver Scott's avatar Oliver Scott Committed by Bruno Martins
Browse files

fixup! Restricted Networking Mode fixes 

The PACKAGE_ADDED broadcast which would add the profile owner app to the restricted networking mode allowlist is not triggered since the app's installation happens before the user is started.
Add the app to the allowlist in the provided OEM profile provisioning callback

Change-Id: Ie68a6921292fb2852743752ea298be7d61c2a016
parent d171bb84

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

+12 −3
Original line number Diff line number Diff line
@@ -17731,7 +17731,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                }

            }









            onCreateAndProvisionManagedProfileCompleted(provisioningParams);









            onCreateAndProvisionManagedProfileCompleted(userInfo.id, provisioningParams);

















            sendProvisioningCompletedBroadcast(









                    userInfo.id,








@@ -17803,8 +17803,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {







     *









     * <p>This method is meant to be overridden by OEMs.









     */









    private void onCreateAndProvisionManagedProfileCompleted(









            ManagedProfileProvisioningParams provisioningParams) {}









    private void onCreateAndProvisionManagedProfileCompleted(int userId,









            ManagedProfileProvisioningParams provisioningParams) {









        try {









            Set<Integer> uids = ConnectivitySettingsManager.getUidsAllowedOnRestrictedNetworks(









                    mContext);









            uids.add(mContext.getPackageManager().getPackageUidAsUser(









                    provisioningParams.getOwnerName(), userId));









            ConnectivitySettingsManager.setUidsAllowedOnRestrictedNetworks(mContext, uids);









        } catch (NameNotFoundException ignored) {









        }









    }

















    private void maybeInstallDevicePolicyManagementRoleHolderInUser(int targetUserId) {









        String devicePolicyManagerRoleHolderPackageName =