commit 3054ea52957a7f448997083e5a299dc4c531a801
author Saumya Pathak <saumyap@google.com> Tue Mar 09 22:14:22 2021 +0000
committer Saumya Pathak <saumyap@google.com> Mon Mar 22 22:53:29 2021 +0000
tree 15ede7edc4915d3185ad798a6a592c2a9235e6a2
parent d1ee532d31fa79c0c78b9ce24b89127450421691

Do not install the MediaProvider module in the clone profile

Bug: 182396009
Test: atest android.multiuser.cts.UserManagerTest#testCloneUser, atest com.android.server.pm.UserManagerTest#testCloneUser and manually ran shell commands on the clone user

Change-Id: If1a9a7fe8b446d333f54096ba900209f06d733ce
(cherry picked from commit 503dd382c5c3367ff13a38ce65db7c28b9cecd23)

Android.bp

diff --git a/Android.bp b/Android.bp
index 89f931d..a809320 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,6 +77,8 @@
             "-Xep:MediaProviderMimeType:ERROR",
         ],
     },
+
+    required: ["preinstalled-packages-com.android.providers.media.module.xml"],
 }
 
 // Used by MediaProvider and MediaProviderTests
@@ -121,3 +123,10 @@
          " --minApiLevel 30",
     out: ["com/android/providers/media/MediaProviderStatsLog.java"],
 }
+
+prebuilt_etc {
+      name: "preinstalled-packages-com.android.providers.media.module.xml",
+      src: "preinstalled-packages-com.android.providers.media.module.xml",
+      sub_dir: "sysconfig",
+}
+