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

Commit 108783f5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Move com.android.managedprovisioning package constant to... 

Merge "Merge "Move com.android.managedprovisioning package constant to config.xml" into pi-dev am: c26a909f" into pi-dev-plus-aosp
parents 89022781 3efafc4b

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -3362,4 +3362,6 @@ 
        <item>"wifi"</item>

    </string-array>



    <!-- Package name for ManagedProvisioning which is responsible for provisioning work profiles. -->

    <string name="config_managed_provisioning_package" translatable="false">com.android.managedprovisioning</string>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3288,4 +3288,6 @@ 
  <java-symbol type="string" name="zen_upgrade_notification_title" />

  <java-symbol type="string" name="zen_upgrade_notification_content" />



  <java-symbol type="string" name="config_managed_provisioning_package" />



</resources>

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

+7 −5
Original line number Diff line number Diff line
@@ -332,8 +332,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    private static final String ATTR_APPLICATION_RESTRICTIONS_MANAGER

            = "application-restrictions-manager";













    private static final String MANAGED_PROVISIONING_PKG = "com.android.managedprovisioning";



























    // Comprehensive list of delegations.















    private static final String DELEGATIONS[] = {















        DELEGATION_CERT_INSTALL,










@@ -766,7 +764,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                // Notify ManagedProvisioning to update the built-in cross profile intent filters.















                Intent intent = new Intent(















                        DevicePolicyManager.ACTION_DATA_SHARING_RESTRICTION_CHANGED);













                intent.setPackage(MANAGED_PROVISIONING_PKG);













                intent.setPackage(getManagedProvisioningPackage(mContext));















                intent.putExtra(Intent.EXTRA_USER_ID, userId);















                intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);















                mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM);










@@ -8957,7 +8955,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                .putExtra(















                        DevicePolicyManager.EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED,















                        leaveAllSystemAppsEnabled)













                .setPackage(MANAGED_PROVISIONING_PKG)













                .setPackage(getManagedProvisioningPackage(mContext))















                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);















        mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM);
























@@ -13093,4 +13091,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                    metrics.symbols);















        }















    }

























    private static String getManagedProvisioningPackage(Context context) {













        return context.getResources().getString(R.string.config_managed_provisioning_package);













    }















}

























services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java



+4
−0






























Original line number
Diff line number
Diff line








@@ -4694,6 +4694,8 @@ public class DevicePolicyManagerTest extends DpmTestBase {













    }































    public void testDisallowSharingIntoProfileSetRestriction() {













        when(mServiceContext.resources.getString(R.string.config_managed_provisioning_package))













                .thenReturn("com.android.managedprovisioning");















        Bundle restriction = new Bundle();















        restriction.putBoolean(UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, true);

























@@ -4705,6 +4707,8 @@ public class DevicePolicyManagerTest extends DpmTestBase {













    }































    public void testDisallowSharingIntoProfileClearRestriction() {













        when(mServiceContext.resources.getString(R.string.config_managed_provisioning_package))













                .thenReturn("com.android.managedprovisioning");















        Bundle restriction = new Bundle();















        restriction.putBoolean(UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, true);