Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-24 16:05:32 +00:00
committed by Android (Google) Code Review
parent 50c8a48d3a 4b2931194e
commit e61854471e
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/api/system-current.txt
View File

@@ -1195,13 +1195,16 @@ package android.app.admin {
public static final class DevicePolicyResources.Strings { public static final class DevicePolicyResources.Strings {
} }
public static final class DevicePolicyResources.Strings.PermissionController { public static final class DevicePolicyResources.Strings.DefaultAppSettings {
field public static final String BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE = "PermissionController.BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE"; field public static final String HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE = "DefaultAppSettings.HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE";
field public static final String BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = "PermissionController.BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE"; field public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = "DefaultAppSettings.WORK_PROFILE_DEFAULT_APPS_TITLE";
field public static final String FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = "PermissionController.FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE"; }
field public static final String HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE = "PermissionController.HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE";
field public static final String LOCATION_AUTO_GRANTED_MESSAGE = "PermissionController.LOCATION_AUTO_GRANTED_MESSAGE"; public static final class DevicePolicyResources.Strings.PermissionSettings {
field public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = "PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE"; field public static final String BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE = "PermissionSettings.BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE";
field public static final String BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = "PermissionSettings.BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE";
field public static final String FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = "PermissionSettings.FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE";
field public static final String LOCATION_AUTO_GRANTED_MESSAGE = "PermissionSettings.LOCATION_AUTO_GRANTED_MESSAGE";
} }
public class DevicePolicyResourcesManager { public class DevicePolicyResourcesManager {

46
core/java/android/app/admin/DevicePolicyResources.java
View File

@@ -1741,26 +1741,14 @@ public final class DevicePolicyResources {
/** /**
* Class containing the identifiers used to update device management-related system strings * Class containing the identifiers used to update device management-related system strings
* in the Permissions module. * for the permission settings.
*/ */
public static final class PermissionController { public static final class PermissionSettings {
private PermissionController() { private PermissionSettings() {
} }
private static final String PREFIX = "PermissionController."; private static final String PREFIX = "PermissionSettings.";
/**
* Title for settings page to show default apps for work.
*/
public static final String WORK_PROFILE_DEFAULT_APPS_TITLE =
PREFIX + "WORK_PROFILE_DEFAULT_APPS_TITLE";
/**
* Summary indicating that a home role holder app is missing work profile support.
*/
public static final String HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE =
PREFIX + "HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE";
/** /**
* Summary of a permission switch in Settings when the background access is denied by an * Summary of a permission switch in Settings when the background access is denied by an
@@ -1790,5 +1778,29 @@ public final class DevicePolicyResources {
public static final String LOCATION_AUTO_GRANTED_MESSAGE = public static final String LOCATION_AUTO_GRANTED_MESSAGE =
PREFIX + "LOCATION_AUTO_GRANTED_MESSAGE"; PREFIX + "LOCATION_AUTO_GRANTED_MESSAGE";
} }
/**
* Class containing the identifiers used to update device management-related system strings
* for the default app settings.
*/
public static final class DefaultAppSettings {
private DefaultAppSettings() {
}
private static final String PREFIX = "DefaultAppSettings.";
/**
* Title for settings page to show default apps for work.
*/
public static final String WORK_PROFILE_DEFAULT_APPS_TITLE =
PREFIX + "WORK_PROFILE_DEFAULT_APPS_TITLE";
/**
* Summary indicating that a home role holder app is missing work profile support.
*/
public static final String HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE =
PREFIX + "HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE";
}
} }
} }