diff options
| author | Joman Chu <jcchu@tycho.ncsc.mil> | 2012-11-16 16:14:37 -0500 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-18 21:02:22 +0100 |
| commit | 2a091b42566d4de5fd88e6e58f29f9b7feadc0b7 (patch) | |
| tree | ec4f4e3a1a8c39a2ce34df38a2033f92d5720eba /core/res | |
| parent | b00a063e976fe2f97a3297b769310fc70ca4f699 (diff) | |
| download | frameworks_base-2a091b42566d4de5fd88e6e58f29f9b7feadc0b7.zip frameworks_base-2a091b42566d4de5fd88e6e58f29f9b7feadc0b7.tar.gz frameworks_base-2a091b42566d4de5fd88e6e58f29f9b7feadc0b7.tar.bz2 | |
Implement Device Admin API for MMAC
Conflicts:
api/current.txt
core/java/android/app/admin/DevicePolicyManager.java
Change-Id: I1df507ced67fbcab8fdcde9cce78705b5e54e346
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f67e9b2..d71a24a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1824,6 +1824,10 @@ <string name="policylab_enforceSelinux">Enforce SELinux</string> <!-- Description of policy access to start enforcing SELinux policy [CHAR LIMIT=110]--> <string name="policydesc_enforceSelinux">Toggle SELinux policy enforcing or permissive mode.</string> + <!-- Title of policy access to start enforcing SE Android MMAC policy [CHAR LIMIT=30]--> + <string name="policylab_enforceMmac">Enforce SE Android MMAC</string> + <!-- Description of policy access to start enforcing SE Android MMAC policy [CHAR LIMIT=110]--> + <string name="policydesc_enforceMmac">Toggle SE Android MMAC policy enforcing or permissive mode.</string> <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip /> <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 06f9acb..ef66ddd 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -865,6 +865,8 @@ <java-symbol type="string" name="owner_name" /> <java-symbol type="string" name="policylab_enforceSelinux" /> <java-symbol type="string" name="policydesc_enforceSelinux" /> + <java-symbol type="string" name="policylab_enforceMmac" /> + <java-symbol type="string" name="policydesc_enforceMmac" /> <java-symbol type="plurals" name="abbrev_in_num_days" /> <java-symbol type="plurals" name="abbrev_in_num_hours" /> |