From 8ed9ece93dca5c7266ca7d9c5fabe7c9a6b214e7 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sat, 9 Apr 2016 16:12:01 -0600
Subject: [PATCH] Revert "Keep read/write external storage as built-in
 permissions"

This reverts commit 4086750e30d04715d5be3ca6eaa75a4a1fa41d56.
---
 data/etc/platform.xml                              | 14 --------------
 .../core/java/com/android/server/pm/Settings.java  |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 8a7d39b65edd0..d412d7c5aa33b 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -111,20 +111,6 @@
         <group gid="media" />
     </permission>
 
-    <!-- These are permissions that were mapped to gids but we need
-         to keep them here until an upgrade from L to the current
-         version is to be supported. These permissions are built-in
-         and in L were not stored in packages.xml as a result if they
-         are not defined here while parsing packages.xml we would
-         ignore these permissions being granted to apps and not
-         propagate the granted state. From N we are storing the
-         built-in permissions in packages.xml as the saved storage
-         is negligible (one tag with the permission) compared to
-         the fragility as one can remove a built-in permission which
-         no longer needs to be mapped to gids and break grant propagation. -->
-    <permission name="android.permission.READ_EXTERNAL_STORAGE" />
-    <permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
     <!-- ================================================================== -->
     <!-- ================================================================== -->
     <!-- ================================================================== -->
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index aca182484324a..83cd9784a1f1f 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -2699,7 +2699,7 @@ final class Settings {
 
     void writePermissionLPr(XmlSerializer serializer, BasePermission bp)
             throws XmlPullParserException, java.io.IOException {
-        if (bp.sourcePackage != null) {
+        if (bp.type != BasePermission.TYPE_BUILTIN && bp.sourcePackage != null) {
             serializer.startTag(null, TAG_ITEM);
             serializer.attribute(null, ATTR_NAME, bp.name);
             serializer.attribute(null, "package", bp.sourcePackage);