Merge "Oops, wrong package name." into rvc-dev
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 9259e94..b8bd99d 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -167,6 +167,7 @@
import com.android.providers.media.DatabaseHelper.OnLegacyMigrationListener;
import com.android.providers.media.fuse.ExternalStorageServiceImpl;
import com.android.providers.media.fuse.FuseDaemon;
+import com.android.providers.media.playlist.Playlist;
import com.android.providers.media.scan.MediaScanner;
import com.android.providers.media.scan.ModernMediaScanner;
import com.android.providers.media.scan.NullMediaScanner;
@@ -183,7 +184,6 @@
import com.android.providers.media.util.RedactingFileDescriptor;
import com.android.providers.media.util.SQLiteQueryBuilder;
import com.android.providers.media.util.XmpInterface;
-import com.android.providers.playlist.Playlist;
import com.google.common.hash.Hashing;
diff --git a/src/com/android/providers/playlist/M3uPlaylistPersister.java b/src/com/android/providers/media/playlist/M3uPlaylistPersister.java
similarity index 97%
rename from src/com/android/providers/playlist/M3uPlaylistPersister.java
rename to src/com/android/providers/media/playlist/M3uPlaylistPersister.java
index 06cefc7..b877ed1 100644
--- a/src/com/android/providers/playlist/M3uPlaylistPersister.java
+++ b/src/com/android/providers/media/playlist/M3uPlaylistPersister.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.providers.playlist;
+package com.android.providers.media.playlist;
import android.text.TextUtils;
diff --git a/src/com/android/providers/playlist/Playlist.java b/src/com/android/providers/media/playlist/Playlist.java
similarity index 98%
rename from src/com/android/providers/playlist/Playlist.java
rename to src/com/android/providers/media/playlist/Playlist.java
index 0a3c9b4..ddc901c 100644
--- a/src/com/android/providers/playlist/Playlist.java
+++ b/src/com/android/providers/media/playlist/Playlist.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.providers.playlist;
+package com.android.providers.media.playlist;
import static com.android.providers.media.util.Logging.TAG;
diff --git a/src/com/android/providers/playlist/PlaylistPersister.java b/src/com/android/providers/media/playlist/PlaylistPersister.java
similarity index 98%
rename from src/com/android/providers/playlist/PlaylistPersister.java
rename to src/com/android/providers/media/playlist/PlaylistPersister.java
index a673968..360f37b 100644
--- a/src/com/android/providers/playlist/PlaylistPersister.java
+++ b/src/com/android/providers/media/playlist/PlaylistPersister.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.providers.playlist;
+package com.android.providers.media.playlist;
import android.content.ContentResolver;
import android.net.Uri;
diff --git a/src/com/android/providers/playlist/PlsPlaylistPersister.java b/src/com/android/providers/media/playlist/PlsPlaylistPersister.java
similarity index 98%
rename from src/com/android/providers/playlist/PlsPlaylistPersister.java
rename to src/com/android/providers/media/playlist/PlsPlaylistPersister.java
index 5fcc40e..ebcc633 100644
--- a/src/com/android/providers/playlist/PlsPlaylistPersister.java
+++ b/src/com/android/providers/media/playlist/PlsPlaylistPersister.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.providers.playlist;
+package com.android.providers.media.playlist;
import androidx.annotation.NonNull;
diff --git a/src/com/android/providers/playlist/WplPlaylistPersister.java b/src/com/android/providers/media/playlist/WplPlaylistPersister.java
similarity index 98%
rename from src/com/android/providers/playlist/WplPlaylistPersister.java
rename to src/com/android/providers/media/playlist/WplPlaylistPersister.java
index 6b47766..a2f6646 100644
--- a/src/com/android/providers/playlist/WplPlaylistPersister.java
+++ b/src/com/android/providers/media/playlist/WplPlaylistPersister.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.providers.playlist;
+package com.android.providers.media.playlist;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.START_TAG;
diff --git a/src/com/android/providers/playlist/XspfPlaylistPersister.java b/src/com/android/providers/media/playlist/XspfPlaylistPersister.java
similarity index 98%
rename from src/com/android/providers/playlist/XspfPlaylistPersister.java
rename to src/com/android/providers/media/playlist/XspfPlaylistPersister.java
index 264ee6c..a97fe9c 100644
--- a/src/com/android/providers/playlist/XspfPlaylistPersister.java
+++ b/src/com/android/providers/media/playlist/XspfPlaylistPersister.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.providers.playlist;
+package com.android.providers.media.playlist;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.START_TAG;
diff --git a/tests/src/com/android/providers/media/playlist/PlaylistPersisterTest.java b/tests/src/com/android/providers/media/playlist/PlaylistPersisterTest.java
index 648195a..9658436 100644
--- a/tests/src/com/android/providers/media/playlist/PlaylistPersisterTest.java
+++ b/tests/src/com/android/providers/media/playlist/PlaylistPersisterTest.java
@@ -18,12 +18,6 @@
import static org.junit.Assert.assertEquals;
-import com.android.providers.playlist.M3uPlaylistPersister;
-import com.android.providers.playlist.PlaylistPersister;
-import com.android.providers.playlist.PlsPlaylistPersister;
-import com.android.providers.playlist.WplPlaylistPersister;
-import com.android.providers.playlist.XspfPlaylistPersister;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/tests/src/com/android/providers/media/playlist/PlaylistTest.java b/tests/src/com/android/providers/media/playlist/PlaylistTest.java
index b13da8e..8570f9f 100644
--- a/tests/src/com/android/providers/media/playlist/PlaylistTest.java
+++ b/tests/src/com/android/providers/media/playlist/PlaylistTest.java
@@ -20,8 +20,6 @@
import androidx.test.runner.AndroidJUnit4;
-import com.android.providers.playlist.Playlist;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;