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

Commit 67969b1e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "DevicePolicyManager: ignore invalid proxy settings" into tm-dev am:... 

Merge "DevicePolicyManager: ignore invalid proxy settings" into tm-dev am: e4d17b17 am: ae2e3b7e am: d5085195

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/33914688



Change-Id: I19c944b7250f3c1696ee85b2c63cab316f43f2c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d66b11f4 d5085195

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

+9 −4
Original line number Diff line number Diff line
@@ -8491,10 +8491,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            Slogf.e(LOG_TAG, "Invalid proxy properties, ignoring: " + proxyProperties.toString());

            return;

        }

        mInjector.settingsGlobalPutString(Settings.Global.GLOBAL_HTTP_PROXY_HOST, data[0]);

        mInjector.settingsGlobalPutInt(Settings.Global.GLOBAL_HTTP_PROXY_PORT, proxyPort);

        mInjector.settingsGlobalPutString(Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST,

        try {

            mInjector.settingsGlobalPutString(Global.GLOBAL_HTTP_PROXY_HOST, data[0]);

            mInjector.settingsGlobalPutInt(Global.GLOBAL_HTTP_PROXY_PORT, proxyPort);

            mInjector.settingsGlobalPutString(Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST,

                    exclusionList);

        } catch (Exception e) {

            //Ignore any potential errors from SettingsProvider, b/365975561

            Slogf.w(LOG_TAG, "Fail to save proxy", e);

        }

    }















    /**