diff options
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 12 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 01f9c7300fa1..dc6d60d567e5 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -154,6 +154,8 @@ public final class MediaStore { public static final String SCAN_FILE_CALL = "scan_file"; /** {@hide} */ public static final String SCAN_VOLUME_CALL = "scan_volume"; + /** {@hide} */ + public static final String SUICIDE_CALL = "suicide"; /** * Extra used with {@link #SCAN_FILE_CALL} or {@link #SCAN_VOLUME_CALL} to indicate that @@ -3816,6 +3818,16 @@ public final class MediaStore { } /** @hide */ + public static void suicide(Context context) { + final ContentResolver resolver = context.getContentResolver(); + try (ContentProviderClient client = resolver + .acquireUnstableContentProviderClient(AUTHORITY)) { + client.call(SUICIDE_CALL, null, null); + } catch (Exception ignored) { + } + } + + /** @hide */ @TestApi public static Uri scanFile(Context context, File file) { return scan(context, SCAN_FILE_CALL, file, false); diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index f2a6452d6e44..125c1f481062 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -204,7 +204,7 @@ applications that come with the platform <permission name="android.permission.UPDATE_DEVICE_STATS"/> </privapp-permissions> - <privapp-permissions package="com.android.providers.media"> + <privapp-permissions package="com.android.providers.media.module"> <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.USE_RESERVED_DISK"/> |