commit 1705c1e9fa406725f1c3847a8a0c4e06d9aa68c4
author Jeffrey Vander Stoep <jeffv@google.com> Thu Apr 23 12:03:15 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 23 12:03:15 2020 +0000
tree fa9bcd2fd0c3ec7933618ebdd50cbf67f668f065
parent e69064de52206ec04349de05a9720a0fcd2a8418
parent 2498d1c46e8d810498d7a30ad677247969b7407f

Merge "mediaprovider: fixed sharedUserId bug"

Android.bp

diff --git a/Android.bp b/Android.bp
index 4973c13..a2f202f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -375,3 +375,12 @@
     reqd_mask: true,
     soc_specific: true,
 }
+
+// For vts_treble_sys_prop_test
+filegroup {
+    name: "private_property_contexts",
+    srcs: ["private/property_contexts"],
+    visibility: [
+        "//test/vts-testcase/security/system_property",
+    ],
+}

private/seapp_contexts

diff --git a/private/seapp_contexts b/private/seapp_contexts
index 6c86bdb..99d1e6c 100644
--- a/private/seapp_contexts
+++ b/private/seapp_contexts
@@ -165,7 +165,7 @@
 user=_app isPrivApp=true name=com.google.android.gms domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app isPrivApp=true name=com.google.android.gms.* domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app isPrivApp=true name=com.google.android.gms:* domain=gmscore_app type=privapp_data_file levelFrom=user
-user=_app isPrivApp=true name=com.google.android.gfs domain=gmscore_app type=privapp_data_file levelFrom=user
+user=_app isPrivApp=true name=com.google.android.gsf domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app minTargetSdkVersion=30 domain=untrusted_app type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=29 domain=untrusted_app_29 type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=28 domain=untrusted_app_27 type=app_data_file levelFrom=all