Commits

Stephen Smalley committed 0d06975 Merge

Merge branch 'master' into intent_mac

  • Participants
  • Parent commits 0a2c91e, fd07a1b
  • Branches intent_mac

Comments (0)

Files changed (3)

 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := SEAndroidAdmin
+LOCAL_PACKAGE_NAME := SEAdmin
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-This program (SEAndroidAdmin) is public domain software, i.e. not copyrighted.
+This program (SEAdmin) is public domain software, i.e. not copyrighted.
 
 Warranty Exclusion
 ------------------

File res/values/strings.xml

     <string name="app_name">SEAdmin</string>
     <string name="activity_name">SEAdmin</string>
 
-    <string name="device_admin_label">SE Android Settings Admin</string>
+    <string name="device_admin_label">SE Admin</string>
     <string name="device_admin_desc">This app is the reference implementation
-        for an Device Admin app that can control SELinux and SE Android MMAC
+        for an Device Admin app that can control SELinux and MMAC
         settings and policies.</string>
 
     <!-- Used in home page screen -->
     <string name="selinux_not_enabled">SELinux is not enabled</string>
 
     <string name="selinux_admin_title">SELinux Administration</string>
-    <string name="mmac_admin_title">SE Android MMAC Administration</string>
+    <string name="mmac_admin_title">MMAC Administration</string>
     <string name="selinux_boolean_fragment_title">Booleans</string>
 
     <!-- Used in Enforcing Fragment -->
     <string name="seappcontexts_reload_title">Reload SEApp Contexts policy</string>
     <string name="seappcontexts_restore_title">Restore default SEApp Contexts policy</string>
 
-    <string name="seandroid_cat">SE Android MMAC capabilities</string>
+    <string name="seandroid_cat">MMAC capabilities</string>
 
-    <string name="mmac_admin_cb_title">SE Android MMAC admin</string>
+    <string name="mmac_admin_cb_title">MMAC admin</string>
     <string name="mmac_admin_cb_summary">Allow SEAdmin to become a MMAC Admin. This is required for the app to set MMAC settings.</string>
 
     <string name="mmac_enforcing_cb_title">Enforce MMAC policy</string>