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

Commit 63723f82 authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "New DPM resources: policy_exempt_apps and vendor_policy_exempt_apps."... 

Merge "New DPM resources: policy_exempt_apps and vendor_policy_exempt_apps." into sc-dev am: e343ba69

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe3c928bb3bcf77d37a3d535228bc08854a74179
parents 0c6b5292 e343ba69

core/res/res/values/policy_exempt_apps.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<resources>

    <!--

    A collection of apps that are critical for the device and hence will never be disabled by

    device policies or APIs.

    -->

    <string-array translatable="false" name="policy_exempt_apps">

    </string-array>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1266,6 +1266,8 @@ 
  <java-symbol type="array" name="vendor_disallowed_apps_managed_device" />

  <java-symbol type="array" name="cross_profile_apps" />

  <java-symbol type="array" name="vendor_cross_profile_apps" />

  <java-symbol type="array" name="policy_exempt_apps" />

  <java-symbol type="array" name="vendor_policy_exempt_apps" />



  <java-symbol type="drawable" name="default_wallpaper" />

  <java-symbol type="drawable" name="default_lock_wallpaper" />

core/res/res/values/vendor_policy_exempt_apps.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<resources>

    <!--

    A collection of apps that are critical for the device and hence will never be disabled by

    device policies or APIs.

    -->

    <string-array translatable="false" name="vendor_policy_exempt_apps">

    </string-array>

</resources>

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

+2 −0
Original line number Diff line number Diff line
@@ -9333,6 +9333,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        dumpResources(pw, mContext, "vendor_cross_profile_apps", R.array.vendor_cross_profile_apps);

        dumpResources(pw, mContext, "config_packagesExemptFromSuspension",

                R.array.config_packagesExemptFromSuspension);

        dumpResources(pw, mContext, "policy_exempt_apps", R.array.policy_exempt_apps);

        dumpResources(pw, mContext, "vendor_policy_exempt_apps", R.array.vendor_policy_exempt_apps);

        pw.decreaseIndent();

        pw.println();

    }