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

Commit 55c46f29 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Clean up DPM/DPMS to reduce code size. 

Change-Id: Id6c1666ef4cdba795e3b6e4ddcb9c32e6ee90665
parent 65fd3fec

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

+144 −149

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −17
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;

import android.util.PrintWriterPrinter;

import android.util.Printer;

import android.util.Slog;

import android.util.SparseArray;

import android.util.Xml;
@@ -1752,11 +1750,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


        try {

            return new DeviceAdminInfo(mContext, ri);

        } catch (XmlPullParserException e) {

            Slog.w(LOG_TAG, "Bad device admin requested for user=" + userHandle + ": " + adminName,

                    e);

            return null;

        } catch (IOException e) {

        } catch (XmlPullParserException | IOException e) {

            Slog.w(LOG_TAG, "Bad device admin requested for user=" + userHandle + ": " + adminName,

                    e);

            return null;
@@ -1994,18 +1988,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    XmlUtils.skipCurrentTag(parser);

                }

            }

        } catch (NullPointerException e) {

            Slog.w(LOG_TAG, "failed parsing " + file + " " + e);

        } catch (NumberFormatException e) {

            Slog.w(LOG_TAG, "failed parsing " + file + " " + e);

        } catch (XmlPullParserException e) {

            Slog.w(LOG_TAG, "failed parsing " + file + " " + e);

        } catch (FileNotFoundException e) {

            // Don't be noisy, this is normal if we haven't defined any policies.

        } catch (IOException e) {

            Slog.w(LOG_TAG, "failed parsing " + file + " " + e);

        } catch (IndexOutOfBoundsException e) {

            Slog.w(LOG_TAG, "failed parsing " + file + " " + e);

        } catch (NullPointerException | NumberFormatException | XmlPullParserException | IOException

                | IndexOutOfBoundsException e) {

            Slog.w(LOG_TAG, "failed parsing " + file, e);

        }

        try {

            if (stream != null) {