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

Commit 93ffd5dc authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev

parents 2eb5a5f7 52c39a16

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -3306,6 +3306,7 @@ public class DevicePolicyManager { 
     * <p>The settings that can be updated by a profile or device owner with this method are:

     * <ul>

     * <li>{@link Settings.Secure#DEFAULT_INPUT_METHOD}</li>

     * <li>{@link Settings.Secure#INSTALL_NON_MARKET_APPS}</li>

     * <li>{@link Settings.Secure#SKIP_FIRST_USE_HINTS}</li>

     * </ul>

     * <p>A device owner can additionally update the following settings:

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

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        SECURE_SETTINGS_WHITELIST = new HashSet();

        SECURE_SETTINGS_WHITELIST.add(Settings.Secure.DEFAULT_INPUT_METHOD);

        SECURE_SETTINGS_WHITELIST.add(Settings.Secure.SKIP_FIRST_USE_HINTS);

        SECURE_SETTINGS_WHITELIST.add(Settings.Secure.INSTALL_NON_MARKET_APPS);



        SECURE_SETTINGS_DEVICEOWNER_WHITELIST = new HashSet();

        SECURE_SETTINGS_DEVICEOWNER_WHITELIST.addAll(SECURE_SETTINGS_WHITELIST);