Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9c7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17970005

Change-Id: I82d6bf5c1b281c9815ad63bc18f36a9fc1d72ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

@@ -818,6 +818,9 @@ public class SettingsProvider extends ContentProvider {
             getContext().enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS,
                     "Access files from the settings of another user");
         }
+        if (mode.contains("w")) {
+            enforceWritePermission(Manifest.permission.WRITE_SETTINGS);
+        }
         uri = ContentProvider.getUriWithoutUserId(uri);
 
         final String cacheRingtoneSetting;