Loading services/core/java/com/android/server/SystemConfig.java +17 −4 Original line number Diff line number Diff line Loading @@ -670,6 +670,17 @@ public class SystemConfig { } private void readAllPermissions() { readAllPermissionsFromXml(); readAllPermissionsFromEnvironment(); // Apply global feature removal last, after all features have been read. // This only needs to happen once. for (String featureName : mUnavailableFeatures) { removeFeature(featureName); } } private void readAllPermissionsFromXml() { final XmlPullParser parser = Xml.newPullParser(); // Read configuration from system Loading Loading @@ -1732,7 +1743,13 @@ public class SystemConfig { } finally { IoUtils.closeQuietly(permReader); } } // Add features or permission dependent on global system properties (as // opposed to XML permission files). // This only needs to be called once after all features have been parsed // from various partition/apex sources. private void readAllPermissionsFromEnvironment() { // Some devices can be field-converted to FBE, so offer to splice in // those features if not already defined by the static config if (StorageManager.isFileEncrypted()) { Loading Loading @@ -1773,10 +1790,6 @@ public class SystemConfig { addFeature(PackageManager.FEATURE_EROFS_LEGACY, 0); } } for (String featureName : mUnavailableFeatures) { removeFeature(featureName); } } private @Nullable SignedPackage parseEnhancedConfirmationTrustedPackage(XmlPullParser parser, Loading Loading
services/core/java/com/android/server/SystemConfig.java +17 −4 Original line number Diff line number Diff line Loading @@ -670,6 +670,17 @@ public class SystemConfig { } private void readAllPermissions() { readAllPermissionsFromXml(); readAllPermissionsFromEnvironment(); // Apply global feature removal last, after all features have been read. // This only needs to happen once. for (String featureName : mUnavailableFeatures) { removeFeature(featureName); } } private void readAllPermissionsFromXml() { final XmlPullParser parser = Xml.newPullParser(); // Read configuration from system Loading Loading @@ -1732,7 +1743,13 @@ public class SystemConfig { } finally { IoUtils.closeQuietly(permReader); } } // Add features or permission dependent on global system properties (as // opposed to XML permission files). // This only needs to be called once after all features have been parsed // from various partition/apex sources. private void readAllPermissionsFromEnvironment() { // Some devices can be field-converted to FBE, so offer to splice in // those features if not already defined by the static config if (StorageManager.isFileEncrypted()) { Loading Loading @@ -1773,10 +1790,6 @@ public class SystemConfig { addFeature(PackageManager.FEATURE_EROFS_LEGACY, 0); } } for (String featureName : mUnavailableFeatures) { removeFeature(featureName); } } private @Nullable SignedPackage parseEnhancedConfirmationTrustedPackage(XmlPullParser parser, Loading