Move seinfo and install-time changes to inside PMS.

Per request by Google, move the install-time checks entirely
inside PMS.

Change-Id: I01f2a9084dfe7886087b1497070b0d7f2ad8479e

53 files changed, 122 insertions, 78 deletions

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index de0ca83..df50a5e 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -45,7 +45,6 @@ import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
-import android.content.pm.SELinuxMMAC;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Environment;
@@ -259,6 +258,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         }
     }
 
+    private static final String MMAC_ENFORCE_PROPERTY = "persist.mmac.enforce";
+
     private static final String SEPOLICY_PATH_SEPOLICY = "/data/security/sepolicy";
 
     private static final String SEPOLICY_PATH_PROPCTXS = "/data/security/property_contexts";
@@ -3036,12 +3037,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
             return false;
         }
 
-        boolean systemState = SELinuxMMAC.getEnforcingMode();
+        boolean systemState = SystemProperties.getBoolean(MMAC_ENFORCE_PROPERTY, false);
         boolean enforceMMAC = mmacAdmin.enforceMMAC;
         if (!firstBoot || !systemState) {
             if (systemState != enforceMMAC) {
                 Slog.v(TAG, "Changed MMAC enforcing status " + systemState + " to " + enforceMMAC);
-                SELinuxMMAC.setEnforcingMode(enforceMMAC);
+                SystemProperties.set(MMAC_ENFORCE_PROPERTY, enforceMMAC ? "true" : "false");
             }
         }
 
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index b7a9a49..f0408d6 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -85,7 +85,6 @@ import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
-import android.content.pm.SELinuxMMAC;
 import android.content.pm.ServiceInfo;
 import android.content.pm.Signature;
 import android.content.pm.ManifestDigest;
@@ -1041,6 +1040,8 @@ public class PackageManagerService extends IPackageManager.Stub {
 
             readPermissions();
 
+            mFoundPolicyFile = SELinuxMMAC.readInstallPolicy();
+
             mRestoredSettings = mSettings.readLPw(sUserManager.getUsers(false),
                     mSdkVersion, mOnlyCore);
             long startTime = SystemClock.uptimeMillis();
@@ -1164,13 +1165,6 @@ public class PackageManagerService extends IPackageManager.Stub {
                 }
             }
 
-            // Find potential SELinux install policy
-            long startPolicyTime = SystemClock.uptimeMillis();
-            mFoundPolicyFile = SELinuxMMAC.readInstallPolicy();
-            Slog.i(TAG, "Time to scan SELinux install policy: "
-                   + ((SystemClock.uptimeMillis()-startPolicyTime)/1000f)
-                   + " seconds");
-
             // Find base frameworks (resource packages without code).
             mFrameworkInstallObserver = new AppDirObserver(
                 mFrameworkDir.getPath(), OBSERVER_EVENTS, true);
@@ -3659,14 +3653,6 @@ public class PackageManagerService extends IPackageManager.Stub {
         }
         mScanningPath = scanFile;
 
-        if (mFoundPolicyFile && !SELinuxMMAC.passInstallPolicyChecks(pkg) &&
-                SELinuxMMAC.getEnforcingMode()) {
-            Slog.w(TAG, "Installing application package " + pkg.packageName
-                   + " failed due to policy.");
-            mLastScanError = PackageManager.INSTALL_FAILED_POLICY_REJECTED_PERMISSION;
-            return null;
-        }
-
         if ((parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {
             pkg.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
         }
@@ -3895,6 +3881,12 @@ public class PackageManagerService extends IPackageManager.Stub {
             
             if (mSettings.isDisabledSystemPackageLPr(pkg.packageName)) {
                 pkg.applicationInfo.flags |= ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
+            } else if (mFoundPolicyFile && !SELinuxMMAC.passInstallPolicyChecks(pkg) &&
+                       SELinuxMMAC.getEnforcingMode()) {
+                Slog.w(TAG, "Installing application package " + pkg.packageName
+                       + " failed due to policy.");
+                mLastScanError = PackageManager.INSTALL_FAILED_POLICY_REJECTED_PERMISSION;
+                return null;
             }
 
             pkg.applicationInfo.uid = pkgSetting.appId;
diff --git a/core/java/android/content/pm/SELinuxMMAC.java b/services/java/com/android/server/pm/SELinuxMMAC.java
index 5b85adb..fbddba7 100644
--- a/core/java/android/content/pm/SELinuxMMAC.java
+++ b/services/java/com/android/server/pm/SELinuxMMAC.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.content.pm;
+package com.android.server.pm;
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageParser;
@@ -92,7 +92,7 @@ public final class SELinuxMMAC {
     }
 
     /**
-     * Returns the current status of MMAC enforcing mode.
+     * Sets the current status of MMAC enforcing mode.
      * @param boolean value to set the enforcing state too.
      */
     public static void setEnforcingMode(boolean value) {
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index 81a2c14..e303a09 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -1,4 +1,14 @@
-LOCAL_PATH:= $(call my-dir)
+ACTUAL_LOCAL_PATH := $(call my-dir)
+
+# this var will hold all the test apk module names later. 
+FrameworkServicesTests_all_apks :=
+
+# We have to include the subdir makefiles first
+# so that FrameworkServicesTests_all_apks will be populated correctly.
+include $(call all-makefiles-under,$(ACTUAL_LOCAL_PATH))
+
+LOCAL_PATH := $(ACTUAL_LOCAL_PATH)
+
 include $(CLEAR_VARS)
 
 # We only want this apk build for tests.
@@ -18,5 +28,23 @@ LOCAL_PACKAGE_NAME := FrameworksServicesTests
 
 LOCAL_CERTIFICATE := platform
 
+# intermediate dir to include all the test apks as raw resource 
+FrameworkServicesTests_intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/test_apks/res
+LOCAL_RESOURCE_DIR := $(FrameworkServicesTests_intermediates) $(LOCAL_PATH)/res
+
 include $(BUILD_PACKAGE)
 
+# Rules to copy all the test apks to the intermediate raw resource directory 
+FrameworkServicesTests_all_apks_res := $(addprefix $(FrameworkServicesTests_intermediates)/raw/, \
+    $(foreach a, $(FrameworkServicesTests_all_apks), $(patsubst FrameworkServicesTests_%,%,$(a))))
+
+$(FrameworkServicesTests_all_apks_res): $(FrameworkServicesTests_intermediates)/raw/%: $(call intermediates-dir-for,APPS,FrameworkServicesTests_%)/package.apk | $(ACP)
+	$(call copy-file-to-new-target)
+
+# Use R_file_stamp as dependency because we want the test apks in place before the R.java is generated.
+$(R_file_stamp) : $(FrameworkServicesTests_all_apks_res)
+
+FrameworkServicesTests_all_apks :=
+FrameworkServicesTests_intermediates :=
+FrameworkServicesTests_all_apks_res :=
+
diff --git a/services/tests/servicestests/apks/Android.mk b/services/tests/servicestests/apks/Android.mk
new file mode 100644
index 0000000..bd1512b
--- /dev/null
+++ b/services/tests/servicestests/apks/Android.mk
@@ -0,0 +1,7 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+FrameworkServicesTests_BUILD_PACKAGE := $(LOCAL_PATH)/FrameworkServicesTests_apk.mk
+
+# build sub packages
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/services/tests/servicestests/apks/FrameworkServicesTests_apk.mk b/services/tests/servicestests/apks/FrameworkServicesTests_apk.mk
new file mode 100644
index 0000000..1240cb8
--- /dev/null
+++ b/services/tests/servicestests/apks/FrameworkServicesTests_apk.mk
@@ -0,0 +1,12 @@
+
+LOCAL_MODULE_TAGS := tests
+
+# Disable dexpreopt.
+LOCAL_DEX_PREOPT := false
+
+# Make sure every package name gets the FrameworkServicesTests_ prefix.
+LOCAL_PACKAGE_NAME := FrameworkServicesTests_$(LOCAL_PACKAGE_NAME)
+
+FrameworkServicesTests_all_apks += $(LOCAL_PACKAGE_NAME)
+
+include $(BUILD_PACKAGE)
diff --git a/core/tests/coretests/apks/mmac_install_media/Android.mk b/services/tests/servicestests/apks/mmac_install_media/Android.mk
index 615ea10..ea9d948 100644
--- a/core/tests/coretests/apks/mmac_install_media/Android.mk
+++ b/services/tests/servicestests/apks/mmac_install_media/Android.mk
@@ -7,4 +7,4 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_CERTIFICATE := media
 
-include $(FrameworkCoreTests_BUILD_PACKAGE)
+include $(FrameworkServicesTests_BUILD_PACKAGE)
diff --git a/core/tests/coretests/apks/mmac_install_platform/AndroidManifest.xml b/services/tests/servicestests/apks/mmac_install_media/AndroidManifest.xml
index 6394823..fb7587a 100644
--- a/core/tests/coretests/apks/mmac_install_platform/AndroidManifest.xml
+++ b/services/tests/servicestests/apks/mmac_install_media/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworks.coretests.mmac_install_platform">
+    package="com.android.frameworks.servicestests.mmac_install_media">
 
     <uses-permission android:name="android.permission.SET_ANIMATION_SCALE" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
diff --git a/core/tests/coretests/apks/mmac_install_platform_2/src/com/android/frameworks/coretests/DoNothing.java b/services/tests/servicestests/apks/mmac_install_media/src/com/android/frameworks/servicestests/DoNothing.java
index 51f8f19..3f3a35c 100644
--- a/core/tests/coretests/apks/mmac_install_platform_2/src/com/android/frameworks/coretests/DoNothing.java
+++ b/services/tests/servicestests/apks/mmac_install_media/src/com/android/frameworks/servicestests/DoNothing.java
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.frameworks.coretests;
+package com.android.frameworks.servicestests;
 
 public class DoNothing {
 
-}
\ No newline at end of file
+}
diff --git a/core/tests/coretests/apks/mmac_install_platform/Android.mk b/services/tests/servicestests/apks/mmac_install_platform/Android.mk
index bf150d3..5cdd9ba 100644
--- a/core/tests/coretests/apks/mmac_install_platform/Android.mk
+++ b/services/tests/servicestests/apks/mmac_install_platform/Android.mk
@@ -7,4 +7,4 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_CERTIFICATE := platform
 
-include $(FrameworkCoreTests_BUILD_PACKAGE)
+include $(FrameworkServicesTests_BUILD_PACKAGE)
diff --git a/core/tests/coretests/apks/mmac_install_platform_2/AndroidManifest.xml b/services/tests/servicestests/apks/mmac_install_platform/AndroidManifest.xml
index 672ef84..b11b37a 100644
--- a/core/tests/coretests/apks/mmac_install_platform_2/AndroidManifest.xml
+++ b/services/tests/servicestests/apks/mmac_install_platform/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworks.coretests.mmac_install_platform_2">
+    package="com.android.frameworks.servicestests.mmac_install_platform">
 
     <uses-permission android:name="android.permission.SET_ANIMATION_SCALE" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
diff --git a/core/tests/coretests/apks/mmac_install_platform/src/com/android/frameworks/coretests/DoNothing.java b/services/tests/servicestests/apks/mmac_install_platform/src/com/android/frameworks/servicestests/DoNothing.java
index 51f8f19..3f3a35c 100644
--- a/core/tests/coretests/apks/mmac_install_platform/src/com/android/frameworks/coretests/DoNothing.java
+++ b/services/tests/servicestests/apks/mmac_install_platform/src/com/android/frameworks/servicestests/DoNothing.java
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.frameworks.coretests;
+package com.android.frameworks.servicestests;
 
 public class DoNothing {
 
-}
\ No newline at end of file
+}
diff --git a/core/tests/coretests/apks/mmac_install_platform_2/Android.mk b/services/tests/servicestests/apks/mmac_install_platform_2/Android.mk
index 4df2b84..5d8c2c8 100644
--- a/core/tests/coretests/apks/mmac_install_platform_2/Android.mk
+++ b/services/tests/servicestests/apks/mmac_install_platform_2/Android.mk
@@ -7,4 +7,4 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_CERTIFICATE := platform
 
-include $(FrameworkCoreTests_BUILD_PACKAGE)
+include $(FrameworkServicesTests_BUILD_PACKAGE)
diff --git a/core/tests/coretests/apks/mmac_install_media/AndroidManifest.xml b/services/tests/servicestests/apks/mmac_install_platform_2/AndroidManifest.xml
index 8a16dfc..cb60867 100644
--- a/core/tests/coretests/apks/mmac_install_media/AndroidManifest.xml
+++ b/services/tests/servicestests/apks/mmac_install_platform_2/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworks.coretests.mmac_install_media">
+    package="com.android.frameworks.servicestests.mmac_install_platform_2">
 
     <uses-permission android:name="android.permission.SET_ANIMATION_SCALE" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
diff --git a/core/tests/coretests/apks/mmac_install_media/src/com/android/frameworks/coretests/DoNothing.java b/services/tests/servicestests/apks/mmac_install_platform_2/src/com/android/frameworks/servicestests/DoNothing.java
index 51f8f19..3f3a35c 100644
--- a/core/tests/coretests/apks/mmac_install_media/src/com/android/frameworks/coretests/DoNothing.java
+++ b/services/tests/servicestests/apks/mmac_install_platform_2/src/com/android/frameworks/servicestests/DoNothing.java
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.frameworks.coretests;
+package com.android.frameworks.servicestests;
 
 public class DoNothing {
 
-}
\ No newline at end of file
+}
diff --git a/core/tests/coretests/res/raw/mmac_default_all.xml b/services/tests/servicestests/res/raw/mmac_default_all.xml
index 63a2f12..63a2f12 100644
--- a/core/tests/coretests/res/raw/mmac_default_all.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_all.xml
diff --git a/core/tests/coretests/res/raw/mmac_default_black.xml b/services/tests/servicestests/res/raw/mmac_default_black.xml
index 7d30351..7d30351 100644
--- a/core/tests/coretests/res/raw/mmac_default_black.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_black.xml
diff --git a/core/tests/coretests/res/raw/mmac_default_black_deny.xml b/services/tests/servicestests/res/raw/mmac_default_black_deny.xml
index ddd779c..ddd779c 100644
--- a/core/tests/coretests/res/raw/mmac_default_black_deny.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_black_deny.xml
diff --git a/core/tests/coretests/res/raw/mmac_default_inner_pkg.xml b/services/tests/servicestests/res/raw/mmac_default_inner_pkg.xml
index 691e9f0..b7c3e36 100644
--- a/core/tests/coretests/res/raw/mmac_default_inner_pkg.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_inner_pkg.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_media" >
+    <package name="com.android.frameworks.servicestests.mmac_install_media" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
@@ -14,7 +14,7 @@
   <default>
     <allow-all />
     <seinfo value="default" />
-    <package name="com.android.frameworks.coretests.mmac_install_media" >
+    <package name="com.android.frameworks.servicestests.mmac_install_media" >
       <allow-all />
       <seinfo value="insidedefault" />
     </package>
diff --git a/core/tests/coretests/res/raw/mmac_default_inner_pkg_deny.xml b/services/tests/servicestests/res/raw/mmac_default_inner_pkg_deny.xml
index 5d872ab..6909273 100644
--- a/core/tests/coretests/res/raw/mmac_default_inner_pkg_deny.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_inner_pkg_deny.xml
@@ -5,14 +5,14 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_media" >
+    <package name="com.android.frameworks.servicestests.mmac_install_media" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
   </signer>
 
   <default>
-    <package name="com.android.frameworks.coretests.mmac_install_media" >
+    <package name="com.android.frameworks.servicestests.mmac_install_media" >
       <deny-permission name="android.permission.SET_ANIMATION_SCALE" />
       <seinfo value="insidedefault" />
     </package>
diff --git a/core/tests/coretests/res/raw/mmac_default_inner_pkg_out_empty.xml b/services/tests/servicestests/res/raw/mmac_default_inner_pkg_out_empty.xml
index adbb4a2..0e7c72b 100644
--- a/core/tests/coretests/res/raw/mmac_default_inner_pkg_out_empty.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_inner_pkg_out_empty.xml
@@ -5,14 +5,14 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_media" >
+    <package name="com.android.frameworks.servicestests.mmac_install_media" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
   </signer>
 
   <default>
-    <package name="com.android.frameworks.coretests.mmac_install_media" >
+    <package name="com.android.frameworks.servicestests.mmac_install_media" >
       <allow-all />
       <seinfo value="insidedefault" />
     </package>
diff --git a/core/tests/coretests/res/raw/mmac_default_null_seinfo.xml b/services/tests/servicestests/res/raw/mmac_default_null_seinfo.xml
index 20d4a2c..20d4a2c 100644
--- a/core/tests/coretests/res/raw/mmac_default_null_seinfo.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_null_seinfo.xml
diff --git a/core/tests/coretests/res/raw/mmac_default_white.xml b/services/tests/servicestests/res/raw/mmac_default_white.xml
index c7f6eab..c7f6eab 100644
--- a/core/tests/coretests/res/raw/mmac_default_white.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_white.xml
diff --git a/core/tests/coretests/res/raw/mmac_default_white_deny.xml b/services/tests/servicestests/res/raw/mmac_default_white_deny.xml
index 0c49ce8..0c49ce8 100644
--- a/core/tests/coretests/res/raw/mmac_default_white_deny.xml
+++ b/services/tests/servicestests/res/raw/mmac_default_white_deny.xml
diff --git a/core/tests/coretests/res/raw/mmac_diff_name_deny_outer.xml b/services/tests/servicestests/res/raw/mmac_diff_name_deny_outer.xml
index d221d21..e9e852c 100644
--- a/core/tests/coretests/res/raw/mmac_diff_name_deny_outer.xml
+++ b/services/tests/servicestests/res/raw/mmac_diff_name_deny_outer.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <deny-permission name="android.permission.SET_ANIMATION_SCALE" />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
@@ -17,7 +17,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_diff_name_skip_outer.xml b/services/tests/servicestests/res/raw/mmac_diff_name_skip_outer.xml
index 4e961d7..996e80b 100644
--- a/core/tests/coretests/res/raw/mmac_diff_name_skip_outer.xml
+++ b/services/tests/servicestests/res/raw/mmac_diff_name_skip_outer.xml
@@ -3,7 +3,7 @@
 
   <!-- Platform dev key with AOSP -->
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
@@ -15,7 +15,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_inner_seinfo_null_outer_seinfo.xml b/services/tests/servicestests/res/raw/mmac_inner_seinfo_null_outer_seinfo.xml
index 78ff6bc..8348812 100644
--- a/core/tests/coretests/res/raw/mmac_inner_seinfo_null_outer_seinfo.xml
+++ b/services/tests/servicestests/res/raw/mmac_inner_seinfo_null_outer_seinfo.xml
@@ -4,7 +4,7 @@
   <!-- Platform dev key with AOSP -->
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-all />
     </package>
   </signer>
@@ -15,7 +15,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_all.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_all.xml
index 75cb633..f98f80a 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_all.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_all.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
@@ -17,7 +17,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_black.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_black.xml
index 20491cf..19d46bc 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_black.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_black.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <deny-permission name="android.permission.NOPE_PERM1" />
       <deny-permission name="android.permission.NOPE_PERM2" />
       <seinfo value="insidepackage" />
@@ -18,7 +18,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_null_seinfo.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_null_seinfo.xml
index a2e6aa1..f48bee0 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_null_seinfo.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_null_seinfo.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
       <allow-permission name="android.permission.CHANGE_CONFIGURATION" />
       <allow-permission name="android.permission.YES1" />
@@ -19,7 +19,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_white.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_white.xml
index 64d3132..83eeb7f 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_allow_white.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_allow_white.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
       <allow-permission name="android.permission.CHANGE_CONFIGURATION" />
       <allow-permission name="android.permission.YES1" />
@@ -20,7 +20,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_deny_default.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_deny_default.xml
index 6d2e678..92f92e1 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_deny_default.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_deny_default.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
       <seinfo value="insidepackage" />
     </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_deny_noother.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_deny_noother.xml
index 53cf65c..e7d7930 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_deny_noother.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_deny_noother.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
       <seinfo value="insidepackage" />
     </package>
diff --git a/core/tests/coretests/res/raw/mmac_inside_pkg_deny_pkg.xml b/services/tests/servicestests/res/raw/mmac_inside_pkg_deny_pkg.xml
index b444b33..e39e7f0 100644
--- a/core/tests/coretests/res/raw/mmac_inside_pkg_deny_pkg.xml
+++ b/services/tests/servicestests/res/raw/mmac_inside_pkg_deny_pkg.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <deny-permission name="android.permission.SET_ANIMATION_SCALE" />
       <seinfo value="insidepackage" />
     </package>
@@ -17,7 +17,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_no_match.xml b/services/tests/servicestests/res/raw/mmac_no_match.xml
index 4f8621a..4f8621a 100644
--- a/core/tests/coretests/res/raw/mmac_no_match.xml
+++ b/services/tests/servicestests/res/raw/mmac_no_match.xml
diff --git a/core/tests/coretests/res/raw/mmac_outer_no_rule_catch_inner.xml b/services/tests/servicestests/res/raw/mmac_outer_no_rule_catch_inner.xml
index 4e961d7..996e80b 100644
--- a/core/tests/coretests/res/raw/mmac_outer_no_rule_catch_inner.xml
+++ b/services/tests/servicestests/res/raw/mmac_outer_no_rule_catch_inner.xml
@@ -3,7 +3,7 @@
 
   <!-- Platform dev key with AOSP -->
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
@@ -15,7 +15,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_pkg_all.xml b/services/tests/servicestests/res/raw/mmac_pkg_all.xml
index fad1834..6d9c9c9 100644
--- a/core/tests/coretests/res/raw/mmac_pkg_all.xml
+++ b/services/tests/servicestests/res/raw/mmac_pkg_all.xml
@@ -7,7 +7,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_pkg_black.xml b/services/tests/servicestests/res/raw/mmac_pkg_black.xml
index e996c8e..a52167c 100644
--- a/core/tests/coretests/res/raw/mmac_pkg_black.xml
+++ b/services/tests/servicestests/res/raw/mmac_pkg_black.xml
@@ -7,7 +7,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <deny-permission name="android.permission.NOPE_PERM1" />
     <deny-permission name="android.permission.NOPE_PERM2" />
     <seinfo value="package" />
diff --git a/core/tests/coretests/res/raw/mmac_pkg_deny_black.xml b/services/tests/servicestests/res/raw/mmac_pkg_deny_black.xml
index c1bd872..4aa6555 100644
--- a/core/tests/coretests/res/raw/mmac_pkg_deny_black.xml
+++ b/services/tests/servicestests/res/raw/mmac_pkg_deny_black.xml
@@ -7,7 +7,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <deny-permission name="android.permission.SET_ANIMATION_SCALE" />
     <deny-permission name="android.permission.CHANGE_CONFIGURATION" />
     <seinfo value="package" />
diff --git a/core/tests/coretests/res/raw/mmac_pkg_deny_white.xml b/services/tests/servicestests/res/raw/mmac_pkg_deny_white.xml
index 9dbf0e8..fbb4625 100644
--- a/core/tests/coretests/res/raw/mmac_pkg_deny_white.xml
+++ b/services/tests/servicestests/res/raw/mmac_pkg_deny_white.xml
@@ -7,7 +7,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_pkg_null_seinfo.xml b/services/tests/servicestests/res/raw/mmac_pkg_null_seinfo.xml
index d763a66..ed9030d 100644
--- a/core/tests/coretests/res/raw/mmac_pkg_null_seinfo.xml
+++ b/services/tests/servicestests/res/raw/mmac_pkg_null_seinfo.xml
@@ -7,7 +7,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
     <allow-permission name="android.permission.CHANGE_CONFIGURATION" />
     <allow-permission name="android.permission.YES1" />
diff --git a/core/tests/coretests/res/raw/mmac_pkg_white.xml b/services/tests/servicestests/res/raw/mmac_pkg_white.xml
index 4d785c4..7c3de78 100644
--- a/core/tests/coretests/res/raw/mmac_pkg_white.xml
+++ b/services/tests/servicestests/res/raw/mmac_pkg_white.xml
@@ -7,7 +7,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-permission name="android.permission.SET_ANIMATION_SCALE" />
     <allow-permission name="android.permission.CHANGE_CONFIGURATION" />
     <allow-permission name="android.permission.YES1" />
diff --git a/core/tests/coretests/res/raw/mmac_same_name_diff_cert.xml b/services/tests/servicestests/res/raw/mmac_same_name_diff_cert.xml
index d9bfb28..b376cd0 100644
--- a/core/tests/coretests/res/raw/mmac_same_name_diff_cert.xml
+++ b/services/tests/servicestests/res/raw/mmac_same_name_diff_cert.xml
@@ -5,7 +5,7 @@
   <signer signature="308204a830820390a003020102020900b3998086d056cffa300d06092a864886f70d0101040500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3038303431353232343035305a170d3335303930313232343035305a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d003082010802820101009c780592ac0d5d381cdeaa65ecc8a6006e36480c6d7207b12011be50863aabe2b55d009adf7146d6f2202280c7cd4d7bdb26243b8a806c26b34b137523a49268224904dc01493e7c0acf1a05c874f69b037b60309d9074d24280e16bad2a8734361951eaf72a482d09b204b1875e12ac98c1aa773d6800b9eafde56d58bed8e8da16f9a360099c37a834a6dfedb7b6b44a049e07a269fccf2c5496f2cf36d64df90a3b8d8f34a3baab4cf53371ab27719b3ba58754ad0c53fc14e1db45d51e234fbbe93c9ba4edf9ce54261350ec535607bf69a2ff4aa07db5f7ea200d09a6c1b49e21402f89ed1190893aab5a9180f152e82f85a45753cf5fc19071c5eec827020103a381fc3081f9301d0603551d0e041604144fe4a0b3dd9cba29f71d7287c4e7c38f2086c2993081c90603551d230481c13081be80144fe4a0b3dd9cba29f71d7287c4e7c38f2086c299a1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900b3998086d056cffa300c0603551d13040530030101ff300d06092a864886f70d01010405000382010100572551b8d93a1f73de0f6d469f86dad6701400293c88a0cd7cd778b73dafcc197fab76e6212e56c1c761cfc42fd733de52c50ae08814cefc0a3b5a1a4346054d829f1d82b42b2048bf88b5d14929ef85f60edd12d72d55657e22e3e85d04c831d613d19938bb8982247fa321256ba12d1d6a8f92ea1db1c373317ba0c037f0d1aff645aef224979fba6e7a14bc025c71b98138cef3ddfc059617cf24845cf7b40d6382f7275ed738495ab6e5931b9421765c491b72fb68e080dbdb58c2029d347c8b328ce43ef6a8b15533edfbe989bd6a48dd4b202eda94c6ab8dd5b8399203daae2ed446232e4fe9bd961394c6300e5138e3cfd285e6e4e483538cb8b1b357" >
     <allow-all />
     <seinfo value="platform" />
-    <package name="com.android.frameworks.coretests.mmac_install_platform" >
+    <package name="com.android.frameworks.servicestests.mmac_install_platform" >
       <allow-all />
       <seinfo value="insidepackage" />
     </package>
@@ -17,7 +17,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_media" >
+  <package name="com.android.frameworks.servicestests.mmac_install_media" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_sig_all.xml b/services/tests/servicestests/res/raw/mmac_sig_all.xml
index 20b6278..513b890 100644
--- a/core/tests/coretests/res/raw/mmac_sig_all.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_all.xml
@@ -13,7 +13,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_sig_black.xml b/services/tests/servicestests/res/raw/mmac_sig_black.xml
index 525d25c..2a54380 100644
--- a/core/tests/coretests/res/raw/mmac_sig_black.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_black.xml
@@ -13,7 +13,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_sig_deny_default_allow.xml b/services/tests/servicestests/res/raw/mmac_sig_deny_default_allow.xml
index 4f2b808..4f2b808 100644
--- a/core/tests/coretests/res/raw/mmac_sig_deny_default_allow.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_deny_default_allow.xml
diff --git a/core/tests/coretests/res/raw/mmac_sig_deny_default_deny.xml b/services/tests/servicestests/res/raw/mmac_sig_deny_default_deny.xml
index f2e9200..f2e9200 100644
--- a/core/tests/coretests/res/raw/mmac_sig_deny_default_deny.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_deny_default_deny.xml
diff --git a/core/tests/coretests/res/raw/mmac_sig_deny_noother.xml b/services/tests/servicestests/res/raw/mmac_sig_deny_noother.xml
index a82e9e6..a82e9e6 100644
--- a/core/tests/coretests/res/raw/mmac_sig_deny_noother.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_deny_noother.xml
diff --git a/core/tests/coretests/res/raw/mmac_sig_deny_pkg_allow.xml b/services/tests/servicestests/res/raw/mmac_sig_deny_pkg_allow.xml
index 254b06c..e994946 100644
--- a/core/tests/coretests/res/raw/mmac_sig_deny_pkg_allow.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_deny_pkg_allow.xml
@@ -13,7 +13,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_sig_deny_pkg_deny.xml b/services/tests/servicestests/res/raw/mmac_sig_deny_pkg_deny.xml
index cc55f61..014bdc6 100644
--- a/core/tests/coretests/res/raw/mmac_sig_deny_pkg_deny.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_deny_pkg_deny.xml
@@ -13,7 +13,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <deny-permission name="android.permission.SET_ANIMATION_SCALE" />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_sig_null.xml b/services/tests/servicestests/res/raw/mmac_sig_null.xml
index 89b9f86..86ab088 100644
--- a/core/tests/coretests/res/raw/mmac_sig_null.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_null.xml
@@ -12,7 +12,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/res/raw/mmac_sig_white.xml b/services/tests/servicestests/res/raw/mmac_sig_white.xml
index 9ee7275..66fe3a7 100644
--- a/core/tests/coretests/res/raw/mmac_sig_white.xml
+++ b/services/tests/servicestests/res/raw/mmac_sig_white.xml
@@ -16,7 +16,7 @@
     <seinfo value="media" />
   </signer>
 
-  <package name="com.android.frameworks.coretests.mmac_install_platform" >
+  <package name="com.android.frameworks.servicestests.mmac_install_platform" >
     <allow-all />
     <seinfo value="package" />
   </package>
diff --git a/core/tests/coretests/src/android/content/pm/SELinuxMMACTests.java b/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java
index b0a7979..d4c2d57 100644
--- a/core/tests/coretests/src/android/content/pm/SELinuxMMACTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package android.content.pm;
+package com.android.server.pm;
 
-import android.content.pm.PackageManagerTests;
-import android.content.pm.SELinuxMMAC;
+//import android.content.pm.PackageManagerTests;
+import android.content.pm.PackageParser;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.net.Uri;
@@ -27,12 +27,13 @@ import android.test.suitebuilder.annotation.LargeTest;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
-import com.android.frameworks.coretests.R;
+import com.android.frameworks.servicestests.R;
 
 import java.io.File;
 import java.io.FileReader;
 import java.io.InputStream;
 
+/** Test {@link SELinuxMMAC} functionality. */
 public class SELinuxMMACTests extends AndroidTestCase {
 
     private static final String TAG = "SELinuxMMACTests";
@@ -63,6 +64,9 @@ public class SELinuxMMACTests extends AndroidTestCase {
         // Just in case still around
         MAC_INSTALL_TMP.delete();
         APK_INSTALL_TMP.delete();
+
+        // Reload the original policy
+        SELinuxMMAC.readInstallPolicy();
     }
 
     void failStr(String errMsg) {