Restore deleted database row on create and rename

On create & rename, if the new path was previously deleted, saved
deleted row ID is restored.

Added custom database functions to generate row ID for insert and update
operations. Deleted row ID is restored only if insert and update are
initiated by FUSE thread.

Test: atest packages/providers/MediaProvider
Bug: 151076202
Change-Id: Ib6cc0b84f6f79988226cbd960395321facabafb6

1 files changed, 2 insertions, 2 deletions

diff --git a/legacy/src/com/android/providers/media/LegacyMediaProvider.java b/legacy/src/com/android/providers/media/LegacyMediaProvider.java
index 488e72a8e..086f88c52 100644
--- a/legacy/src/com/android/providers/media/LegacyMediaProvider.java
+++ b/legacy/src/com/android/providers/media/LegacyMediaProvider.java
@@ -73,9 +73,9 @@ public class LegacyMediaProvider extends ContentProvider {
         Logging.initPersistent(persistentDir);
 
         mInternalDatabase = new DatabaseHelper(context, INTERNAL_DATABASE_NAME,
-                true, false, true, null, null, null, null);
+                true, false, true, null, null, null, null, null);
         mExternalDatabase = new DatabaseHelper(context, EXTERNAL_DATABASE_NAME,
-                false, false, true, null, null, null, null);
+                false, false, true, null, null, null, null, null);
 
         return true;
     }