Build MediaProviderLegacy with "system_current".
As a recent bug just reminded us, we can't have MediaProviderLegacy
depending on hidden APIs delivered through the APEX, since they're
unstable and can change at any time.
This requires a slight pivot of our original design strategy, where
the only shared code between the legacy and modern providers is the
DatabaseHelper logic. This requires some side-stepping to ensure
that DatabaseHelper and its dependencies safely build against
"system_current".
We also adjust DatabaseHelper to only log metrics when running as
the real production database, to avoid noise from the legacy provider
and unit tests.
These changes also helped uncover that our unit tests were
technically running against MediaProviderLegacy, which no longer
holds the bulk of the code that needs to be tested. It's tricky to
get an accurate instrumentation target because our tests live in
AOSP, but a device may have either the AOSP or Mainline version of
the module. Thus we pull everything directly into MediaProviderTests
to ensure that we can run tests against it.
Bug: 146670970
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ib257793f5d8a12eb83e18b0eed6284e25d7c011c
diff --git a/Android.bp b/Android.bp
index 5cdbba8..f509a00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,6 @@
-java_defaults {
- name: "mediaprovider_defaults",
-
+android_app {
+ name: "MediaProvider",
manifest: "AndroidManifest.xml",
static_libs: [
@@ -18,13 +17,8 @@
resource_dirs: [
"res",
],
-
srcs: [
- "src/**/*.aidl",
- "src/**/*.java",
- ":framework-mediaprovider-sources",
- ":framework-mediaprovider-annotation-sources",
- ":statslog-mediaprovider-java-gen",
+ ":mediaprovider-sources",
],
optimize: {
@@ -41,23 +35,40 @@
// sdk_version: "system_current",
certificate: "media",
-
privileged: true,
-}
-android_app {
- name: "MediaProviderLegacy",
- defaults: ["mediaprovider_defaults"],
- manifest: "AndroidManifest_Legacy.xml",
-}
-
-android_app {
- name: "MediaProvider",
- defaults: ["mediaprovider_defaults"],
- manifest: "AndroidManifest.xml",
aaptflags: ["--custom-package com.android.providers.media"],
}
+// This is defined to give MediaProviderTests all the source it needs to
+// run its tests against
+filegroup {
+ name: "mediaprovider-sources",
+ srcs: [
+ "src/**/*.aidl",
+ "src/**/*.java",
+ ":framework-mediaprovider-sources",
+ ":framework-mediaprovider-annotation-sources",
+ ":mediaprovider-database-sources",
+ ":statslog-mediaprovider-java-gen",
+ ],
+}
+
+// This is defined to give LegacyMediaProvider the bare minimum it needs
+// to keep the legacy database schema working while also building
+// against "system_current"
+filegroup {
+ name: "mediaprovider-database-sources",
+ srcs: [
+ "src/com/android/providers/media/DatabaseHelper.java",
+ "src/com/android/providers/media/util/BackgroundThread.java",
+ "src/com/android/providers/media/util/DatabaseUtils.java",
+ "src/com/android/providers/media/util/FileUtils.java",
+ "src/com/android/providers/media/util/HandlerExecutor.java",
+ "src/com/android/providers/media/util/Logging.java",
+ ],
+}
+
platform_compat_config {
name: "media-provider-platform-compat-config",
src: ":MediaProvider",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 72ff578..2e8a4f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,7 @@
<uses-permission android:name="android.permission.USE_RESERVED_DISK" />
<application
+ android:name="com.android.providers.media.MediaApplication"
android:label="@string/app_label"
android:allowBackup="false"
android:supportsRtl="true"
diff --git a/legacy/Android.bp b/legacy/Android.bp
new file mode 100644
index 0000000..65725ef
--- /dev/null
+++ b/legacy/Android.bp
@@ -0,0 +1,21 @@
+
+android_app {
+ name: "MediaProviderLegacy",
+ manifest: "AndroidManifest.xml",
+
+ static_libs: [
+ "androidx.appcompat_appcompat",
+ "androidx.core_core",
+ "guava",
+ ],
+
+ srcs: [
+ "src/**/*.aidl",
+ "src/**/*.java",
+ ":mediaprovider-database-sources",
+ ],
+
+ certificate: "media",
+ privileged: true,
+ sdk_version: "system_current",
+}
diff --git a/AndroidManifest_Legacy.xml b/legacy/AndroidManifest.xml
similarity index 86%
rename from AndroidManifest_Legacy.xml
rename to legacy/AndroidManifest.xml
index 4cbff48..15349b1 100644
--- a/AndroidManifest_Legacy.xml
+++ b/legacy/AndroidManifest.xml
@@ -8,13 +8,12 @@
such as IDs and other user-generated content. -->
<application
- android:label="@string/app_label"
android:process="android.process.media"
android:allowBackup="false"
android:supportsRtl="true"
android:usesCleartextTraffic="true">
<provider
- android:name="com.android.providers.media.MediaProvider"
+ android:name="com.android.providers.media.LegacyMediaProvider"
android:authorities="media_legacy"
android:exported="true"
android:permission="android.permission.WRITE_MEDIA_STORAGE" />
diff --git a/legacy/src/com/android/providers/media/LegacyMediaProvider.java b/legacy/src/com/android/providers/media/LegacyMediaProvider.java
new file mode 100644
index 0000000..3835783
--- /dev/null
+++ b/legacy/src/com/android/providers/media/LegacyMediaProvider.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.providers.media;
+
+import static com.android.providers.media.DatabaseHelper.EXTERNAL_DATABASE_NAME;
+import static com.android.providers.media.DatabaseHelper.INTERNAL_DATABASE_NAME;
+
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.ProviderInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.provider.MediaStore.MediaColumns;
+
+import androidx.annotation.NonNull;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Very limited subset of {@link MediaProvider} which only surfaces
+ * {@link android.provider.MediaStore.Files} data.
+ */
+public class LegacyMediaProvider extends ContentProvider {
+ private DatabaseHelper mInternalDatabase;
+ private DatabaseHelper mExternalDatabase;
+
+ @Override
+ public void attachInfo(Context context, ProviderInfo info) {
+ // Sanity check our setup
+ if (!info.exported) {
+ throw new SecurityException("Provider must be exported");
+ }
+ if (!android.Manifest.permission.WRITE_MEDIA_STORAGE.equals(info.readPermission)
+ || !android.Manifest.permission.WRITE_MEDIA_STORAGE.equals(info.writePermission)) {
+ throw new SecurityException("Provider must be protected by WRITE_MEDIA_STORAGE");
+ }
+
+ super.attachInfo(context, info);
+ }
+
+ @Override
+ public boolean onCreate() {
+ final Context context = getContext();
+
+ mInternalDatabase = new DatabaseHelper(context, INTERNAL_DATABASE_NAME,
+ true, false, true, null, null);
+ mExternalDatabase = new DatabaseHelper(context, EXTERNAL_DATABASE_NAME,
+ false, false, true, null, null);
+
+ return true;
+ }
+
+ private @NonNull DatabaseHelper getDatabaseForUri(Uri uri) {
+ final String volumeName = MediaStore.getVolumeName(uri);
+ switch (volumeName) {
+ case MediaStore.VOLUME_INTERNAL:
+ return mInternalDatabase;
+ default:
+ return mExternalDatabase;
+ }
+ }
+
+ @Override
+ public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ String sortOrder) {
+ final DatabaseHelper helper = getDatabaseForUri(uri);
+ return helper.getReadableDatabase().query("files", projection, selection, selectionArgs,
+ null, null, sortOrder);
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Uri insert(Uri uri, ContentValues values) {
+ try {
+ new File(values.getAsString(MediaColumns.DATA)).createNewFile();
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
+
+ final DatabaseHelper helper = getDatabaseForUri(uri);
+ final long id = helper.getWritableDatabase().insert("files", null, values);
+ return ContentUris.withAppendedId(uri, id);
+ }
+
+ @Override
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/src/com/android/providers/media/DatabaseHelper.java b/src/com/android/providers/media/DatabaseHelper.java
index 27165cb..6a00629 100644
--- a/src/com/android/providers/media/DatabaseHelper.java
+++ b/src/com/android/providers/media/DatabaseHelper.java
@@ -16,15 +16,17 @@
package com.android.providers.media;
-import static com.android.providers.media.MediaProvider.INTERNAL_DATABASE_NAME;
-import static com.android.providers.media.MediaProvider.LOCAL_LOGV;
-import static com.android.providers.media.MediaProvider.TAG;
+import static com.android.providers.media.util.Logging.LOGV;
+import static com.android.providers.media.util.Logging.TAG;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ProviderInfo;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
@@ -33,7 +35,6 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.Looper;
-import android.os.RemoteException;
import android.os.SystemClock;
import android.os.Trace;
import android.provider.MediaStore;
@@ -47,21 +48,25 @@
import android.system.Os;
import android.system.OsConstants;
import android.text.format.DateUtils;
+import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
+import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import com.android.providers.media.util.BackgroundThread;
import com.android.providers.media.util.DatabaseUtils;
import com.android.providers.media.util.FileUtils;
-import com.android.providers.media.util.Metrics;
import java.io.File;
import java.io.FilenameFilter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
import java.util.regex.Matcher;
@@ -78,6 +83,9 @@
// 60 days in milliseconds (1000 * 60 * 60 * 24 * 60)
private static final long OBSOLETE_DATABASE_DB = 5184000000L;
+ static final String INTERNAL_DATABASE_NAME = "internal.db";
+ static final String EXTERNAL_DATABASE_NAME = "external.db";
+
final Context mContext;
final String mName;
final int mVersion;
@@ -85,17 +93,26 @@
final boolean mInternal; // True if this is the internal database
final boolean mEarlyUpgrade;
final boolean mLegacyProvider;
+ final Class<? extends Annotation> mColumnAnnotation;
+ final OnSchemaChangeListener mListener;
long mScanStartTime;
long mScanStopTime;
- public DatabaseHelper(Context context, String name,
- boolean internal, boolean earlyUpgrade, boolean legacyProvider) {
- this(context, name, getDatabaseVersion(context), internal, earlyUpgrade, legacyProvider);
+ public interface OnSchemaChangeListener {
+ public void onSchemaChange(@NonNull String volumeName, int versionFrom, int versionTo,
+ long itemCount, long durationMillis);
}
- @VisibleForTesting
+ public DatabaseHelper(Context context, String name,
+ boolean internal, boolean earlyUpgrade, boolean legacyProvider,
+ Class<? extends Annotation> columnAnnotation, OnSchemaChangeListener listener) {
+ this(context, name, getDatabaseVersion(context),
+ internal, earlyUpgrade, legacyProvider, columnAnnotation, listener);
+ }
+
public DatabaseHelper(Context context, String name, int version,
- boolean internal, boolean earlyUpgrade, boolean legacyProvider) {
+ boolean internal, boolean earlyUpgrade, boolean legacyProvider,
+ Class<? extends Annotation> columnAnnotation, OnSchemaChangeListener listener) {
super(context, name, null, version);
mContext = context;
mName = name;
@@ -104,6 +121,8 @@
mInternal = internal;
mEarlyUpgrade = earlyUpgrade;
mLegacyProvider = legacyProvider;
+ mColumnAnnotation = columnAnnotation;
+ mListener = listener;
setWriteAheadLoggingEnabled(true);
}
@@ -190,7 +209,7 @@
} else {
long time = other.lastModified();
if (time < twoMonthsAgo) {
- if (LOCAL_LOGV) Log.v(TAG, "Deleting old database " + databases[i]);
+ if (LOGV) Log.v(TAG, "Deleting old database " + databases[i]);
mContext.deleteDatabase(databases[i]);
databases[i] = null;
count--;
@@ -216,7 +235,7 @@
// delete least recently used database
if (lruIndex != -1) {
- if (LOCAL_LOGV) Log.v(TAG, "Deleting old database " + databases[lruIndex]);
+ if (LOGV) Log.v(TAG, "Deleting old database " + databases[lruIndex]);
mContext.deleteDatabase(databases[lruIndex]);
databases[lruIndex] = null;
count--;
@@ -224,6 +243,40 @@
}
}
+ @GuardedBy("mProjectionMapCache")
+ private final ArrayMap<Class<?>[], ArrayMap<String, String>>
+ mProjectionMapCache = new ArrayMap<>();
+
+ /**
+ * Return a projection map that represents the valid columns that can be
+ * queried the given contract class. The mapping is built automatically
+ * using the {@link android.provider.Column} annotation, and is designed to
+ * ensure that we always support public API commitments.
+ */
+ public ArrayMap<String, String> getProjectionMap(Class<?>... clazzes) {
+ synchronized (mProjectionMapCache) {
+ ArrayMap<String, String> map = mProjectionMapCache.get(clazzes);
+ if (map == null) {
+ map = new ArrayMap<>();
+ mProjectionMapCache.put(clazzes, map);
+ try {
+ for (Class<?> clazz : clazzes) {
+ for (Field field : clazz.getFields()) {
+ if (Objects.equals(field.getName(), "_ID")
+ || field.isAnnotationPresent(mColumnAnnotation)) {
+ final String column = (String) field.get(null);
+ map.put(column, column);
+ }
+ }
+ }
+ } catch (ReflectiveOperationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return map;
+ }
+ }
+
/**
* List of {@link Uri} that would have been sent directly via
* {@link ContentResolver#notifyChange}, but are instead being collected
@@ -257,7 +310,7 @@
* clustered and sent when the transaction completes.
*/
public void notifyChange(Uri uri) {
- if (LOCAL_LOGV) Log.v(TAG, "Notifying " + uri);
+ if (LOGV) Log.v(TAG, "Notifying " + uri);
final List<Uri> uris = mNotifyChanges.get();
if (uris != null) {
uris.add(uri);
@@ -351,19 +404,19 @@
private void createLatestSchema(SQLiteDatabase db) {
// We're about to start all ID numbering from scratch, so revoke any
// outstanding permission grants to ensure we don't leak data
- mContext.revokeUriPermission(MediaStore.AUTHORITY_URI,
- Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
- MediaDocumentsProvider.revokeAllUriGrants(mContext);
- BackgroundThread.getHandler().post(() -> {
- try (ContentProviderClient client = mContext
- .getContentResolver().acquireContentProviderClient(
- android.provider.Downloads.Impl.AUTHORITY)) {
- client.call(android.provider.Downloads.CALL_REVOKE_MEDIASTORE_URI_PERMS,
- null, null);
- } catch (NullPointerException | RemoteException e) {
- // Should not happen
+ try {
+ final PackageInfo pkg = mContext.getPackageManager().getPackageInfo(
+ mContext.getPackageName(), PackageManager.GET_PROVIDERS);
+ if (pkg != null && pkg.providers != null) {
+ for (ProviderInfo provider : pkg.providers) {
+ mContext.revokeUriPermission(Uri.parse("content://" + provider.authority),
+ Intent.FLAG_GRANT_READ_URI_PERMISSION
+ | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+ }
}
- });
+ } catch (Exception e) {
+ Log.w(TAG, "Failed to revoke permissions", e);
+ }
makePristineSchema(db);
@@ -463,7 +516,7 @@
extras.putInt(MediaStore.QUERY_ARG_MATCH_FAVORITE, MediaStore.MATCH_INCLUDE);
db.execSQL("SAVEPOINT before_migrate");
- Log.d(TAG, "Starting migration from legacy provider");
+ Log.d(TAG, "Starting migration from legacy provider for " + mName);
try (Cursor c = client.query(queryUri, sMigrateColumns.toArray(new String[0]),
extras, null)) {
final ContentValues values = new ContentValues();
@@ -481,7 +534,7 @@
}
db.execSQL("RELEASE before_migrate");
- Log.d(TAG, "Finished migration from legacy provider");
+ Log.d(TAG, "Finished migration from legacy provider for " + mName);
} catch (Exception e) {
// We have to guard ourselves against any weird behavior of the
// legacy provider by trying to catch everything
@@ -533,9 +586,14 @@
c.close();
}
- private static void createLatestViews(SQLiteDatabase db, boolean internal) {
+ private void createLatestViews(SQLiteDatabase db, boolean internal) {
makePristineViews(db);
+ if (mColumnAnnotation == null) {
+ Log.w(TAG, "No column annotation provided; not creating views");
+ return;
+ }
+
if (!internal) {
db.execSQL("CREATE VIEW audio_playlists AS SELECT _id,_data,name,date_added,"
+ "date_modified,owner_package_name,_hash,is_pending,date_expires,is_trashed,"
@@ -562,16 +620,16 @@
+ "3 AS grouporder FROM searchhelpertitle WHERE (title != '')");
db.execSQL("CREATE VIEW audio AS SELECT "
- + String.join(",", MediaProvider.getProjectionMap(Audio.Media.class).keySet())
+ + String.join(",", getProjectionMap(Audio.Media.class).keySet())
+ " FROM files WHERE media_type=2");
db.execSQL("CREATE VIEW video AS SELECT "
- + String.join(",", MediaProvider.getProjectionMap(Video.Media.class).keySet())
+ + String.join(",", getProjectionMap(Video.Media.class).keySet())
+ " FROM files WHERE media_type=3");
db.execSQL("CREATE VIEW images AS SELECT "
- + String.join(",", MediaProvider.getProjectionMap(Images.Media.class).keySet())
+ + String.join(",", getProjectionMap(Images.Media.class).keySet())
+ " FROM files WHERE media_type=1");
db.execSQL("CREATE VIEW downloads AS SELECT "
- + String.join(",", MediaProvider.getProjectionMap(Downloads.class).keySet())
+ + String.join(",", getProjectionMap(Downloads.class).keySet())
+ " FROM files WHERE is_download=1");
db.execSQL("CREATE VIEW audio_artists AS SELECT "
@@ -788,7 +846,7 @@
final long id = c.getLong(0);
final String data = c.getString(1);
values.put(FileColumns.DATA, data);
- MediaProvider.computeDataValues(values);
+ FileUtils.computeDataValues(values);
values.remove(FileColumns.DATA);
if (!values.isEmpty()) {
db.update("files", values, "_id=" + id, null);
@@ -935,8 +993,10 @@
final long elapsedSeconds = elapsedMillis / DateUtils.SECOND_IN_MILLIS;
logToDb(db, "Database upgraded from version " + fromVersion + " to " + toVersion
+ " in " + elapsedSeconds + " seconds");
- Metrics.logSchemaChange(mVolumeName, fromVersion, toVersion,
- getItemCount(db), elapsedMillis);
+ if (mListener != null) {
+ mListener.onSchemaChange(mVolumeName, fromVersion, toVersion,
+ getItemCount(db), elapsedMillis);
+ }
}
private void downgradeDatabase(SQLiteDatabase db, int fromVersion, int toVersion) {
@@ -949,8 +1009,10 @@
final long elapsedSeconds = elapsedMillis / DateUtils.SECOND_IN_MILLIS;
logToDb(db, "Database downgraded from version " + fromVersion + " to " + toVersion
+ " in " + elapsedSeconds + " seconds");
- Metrics.logSchemaChange(mVolumeName, fromVersion, toVersion,
- getItemCount(db), elapsedMillis);
+ if (mListener != null) {
+ mListener.onSchemaChange(mVolumeName, fromVersion, toVersion,
+ getItemCount(db), elapsedMillis);
+ }
}
/**
diff --git a/src/com/android/providers/media/MediaApplication.java b/src/com/android/providers/media/MediaApplication.java
new file mode 100644
index 0000000..98c1ba9
--- /dev/null
+++ b/src/com/android/providers/media/MediaApplication.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.providers.media;
+
+import android.app.Application;
+
+public class MediaApplication extends Application {
+ static {
+ System.loadLibrary("fuse_jni");
+ }
+}
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 05ebba6..ce08c18 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -36,6 +36,8 @@
import static android.provider.MediaStore.QUERY_ARG_RELATED_URI;
import static android.provider.MediaStore.getVolumeName;
+import static com.android.providers.media.DatabaseHelper.EXTERNAL_DATABASE_NAME;
+import static com.android.providers.media.DatabaseHelper.INTERNAL_DATABASE_NAME;
import static com.android.providers.media.LocalCallingIdentity.PERMISSION_IS_BACKUP;
import static com.android.providers.media.LocalCallingIdentity.PERMISSION_IS_LEGACY_GRANTED;
import static com.android.providers.media.LocalCallingIdentity.PERMISSION_IS_LEGACY_READ;
@@ -50,6 +52,7 @@
import static com.android.providers.media.LocalCallingIdentity.PERMISSION_WRITE_VIDEO;
import static com.android.providers.media.scan.MediaScanner.REASON_DEMAND;
import static com.android.providers.media.scan.MediaScanner.REASON_IDLE;
+import static com.android.providers.media.util.FileUtils.computeDataValues;
import static com.android.providers.media.util.FileUtils.extractDisplayName;
import static com.android.providers.media.util.FileUtils.extractFileName;
import static com.android.providers.media.util.FileUtils.extractPathOwnerPackageName;
@@ -58,6 +61,8 @@
import static com.android.providers.media.util.FileUtils.extractTopLevelDir;
import static com.android.providers.media.util.FileUtils.extractVolumeName;
import static com.android.providers.media.util.FileUtils.isDownload;
+import static com.android.providers.media.util.Logging.LOGV;
+import static com.android.providers.media.util.Logging.TAG;
import android.app.AppOpsManager;
import android.app.AppOpsManager.OnOpActiveChangedListener;
@@ -133,7 +138,6 @@
import android.provider.MediaStore.Files.FileColumns;
import android.provider.MediaStore.Images;
import android.provider.MediaStore.Images.ImageColumns;
-import android.provider.MediaStore.Match;
import android.provider.MediaStore.MediaColumns;
import android.provider.MediaStore.Video;
import android.system.ErrnoException;
@@ -179,7 +183,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
@@ -253,10 +256,6 @@
@GuardedBy("sCacheLock")
private static final Map<String, Collection<File>> sCachedVolumeScanPaths = new ArrayMap<>();
- static {
- System.loadLibrary("fuse_jni");
- }
-
private void updateVolumes() {
synchronized (sCacheLock) {
sCachedExternalVolumeNames.clear();
@@ -593,9 +592,9 @@
}
mInternalDatabase = new DatabaseHelper(context, INTERNAL_DATABASE_NAME,
- true, false, mLegacyProvider);
+ true, false, mLegacyProvider, Column.class, Metrics::logSchemaChange);
mExternalDatabase = new DatabaseHelper(context, EXTERNAL_DATABASE_NAME,
- false, false, mLegacyProvider);
+ false, false, mLegacyProvider, Column.class, Metrics::logSchemaChange);
final IntentFilter filter = new IntentFilter();
filter.setPriority(10);
@@ -855,44 +854,6 @@
}
}
- @VisibleForTesting
- static void computeDataValues(ContentValues values) {
- // Worst case we have to assume no bucket details
- values.remove(ImageColumns.BUCKET_ID);
- values.remove(ImageColumns.BUCKET_DISPLAY_NAME);
- values.remove(ImageColumns.GROUP_ID);
- values.remove(ImageColumns.VOLUME_NAME);
- values.remove(ImageColumns.RELATIVE_PATH);
-
- final String data = values.getAsString(MediaColumns.DATA);
- if (TextUtils.isEmpty(data)) return;
-
- final File file = new File(data);
- final File fileLower = new File(data.toLowerCase(Locale.ROOT));
-
- values.put(ImageColumns.VOLUME_NAME, extractVolumeName(data));
- values.put(ImageColumns.RELATIVE_PATH, extractRelativePath(data));
- values.put(ImageColumns.DISPLAY_NAME, extractDisplayName(data));
-
- // Buckets are the parent directory
- final String parent = fileLower.getParent();
- if (parent != null) {
- values.put(ImageColumns.BUCKET_ID, parent.hashCode());
- // The relative path for files in the top directory is "/"
- if (!"/".equals(values.getAsString(ImageColumns.RELATIVE_PATH))) {
- values.put(ImageColumns.BUCKET_DISPLAY_NAME, file.getParentFile().getName());
- }
- }
-
- // Groups are the first part of name
- final String name = fileLower.getName();
- final int firstDot = name.indexOf('.');
- if (firstDot > 0) {
- values.put(ImageColumns.GROUP_ID,
- name.substring(0, firstDot).hashCode());
- }
- }
-
@Override
public Uri canonicalize(Uri uri) {
final boolean allowHidden = isCallingPackageAllowedHidden();
@@ -1690,7 +1651,7 @@
}
private long insertDirectory(SQLiteDatabase db, String path) {
- if (LOCAL_LOGV) Log.v(TAG, "inserting directory " + path);
+ if (LOGV) Log.v(TAG, "inserting directory " + path);
ContentValues values = new ContentValues();
values.put(FileColumns.FORMAT, MtpConstants.FORMAT_ASSOCIATION);
values.put(FileColumns.DATA, path);
@@ -2377,7 +2338,7 @@
}
private static void appendWhereStandaloneMatch(@NonNull SQLiteQueryBuilder qb,
- @NonNull String column, @Match int match) {
+ @NonNull String column, /* @Match */ int match) {
switch (match) {
case MATCH_INCLUDE:
// No special filtering needed
@@ -5460,7 +5421,7 @@
final Uri uri = MediaStore.AUTHORITY_URI.buildUpon().appendPath(volume).build();
getContext().getContentResolver().notifyChange(uri, null);
- if (LOCAL_LOGV) Log.v(TAG, "Attached volume: " + volume);
+ if (LOGV) Log.v(TAG, "Attached volume: " + volume);
if (!MediaStore.VOLUME_INTERNAL.equals(volume)) {
BackgroundThread.getExecutor().execute(() -> {
final DatabaseHelper helper = mExternalDatabase;
@@ -5497,23 +5458,9 @@
final Uri uri = MediaStore.AUTHORITY_URI.buildUpon().appendPath(volume).build();
getContext().getContentResolver().notifyChange(uri, null);
- if (LOCAL_LOGV) Log.v(TAG, "Detached volume: " + volume);
+ if (LOGV) Log.v(TAG, "Detached volume: " + volume);
}
- /*
- * Useful commands to enable debugging:
- * $ adb shell setprop log.tag.MediaProvider VERBOSE
- * $ adb shell setprop db.log.slow_query_threshold.`adb shell cat \
- * /data/system/packages.list |grep "com.android.providers.media " |cut -b 29-33` 0
- * $ adb shell setprop db.log.bindargs 1
- */
-
- public static final String TAG = "MediaProvider";
- public static final boolean LOCAL_LOGV = Log.isLoggable(TAG, Log.VERBOSE);
-
- static final String INTERNAL_DATABASE_NAME = "internal.db";
- static final String EXTERNAL_DATABASE_NAME = "external.db";
-
@GuardedBy("mAttachedVolumeNames")
private final ArraySet<String> mAttachedVolumeNames = new ArraySet<>();
@GuardedBy("mCustomCollators")
@@ -5745,38 +5692,8 @@
addGreylistPattern("case when \\(datetaken >= \\d+ and datetaken < \\d+\\) then datetaken \\* \\d+ when \\(datetaken >= \\d+ and datetaken < \\d+\\) then datetaken when \\(datetaken >= \\d+ and datetaken < \\d+\\) then datetaken / \\d+ else \\d+ end");
}
- @GuardedBy("sProjectionMapCache")
- private static final ArrayMap<Class<?>[], ArrayMap<String, String>>
- sProjectionMapCache = new ArrayMap<>();
-
- /**
- * Return a projection map that represents the valid columns that can be
- * queried the given contract class. The mapping is built automatically
- * using the {@link Column} annotation, and is designed to ensure that we
- * always support public API commitments.
- */
- public static ArrayMap<String, String> getProjectionMap(Class<?>... clazzes) {
- synchronized (sProjectionMapCache) {
- ArrayMap<String, String> map = sProjectionMapCache.get(clazzes);
- if (map == null) {
- map = new ArrayMap<>();
- sProjectionMapCache.put(clazzes, map);
- try {
- for (Class<?> clazz : clazzes) {
- for (Field field : clazz.getFields()) {
- if (Objects.equals(field.getName(), "_ID")
- || field.isAnnotationPresent(Column.class)) {
- final String column = (String) field.get(null);
- map.put(column, column);
- }
- }
- }
- } catch (ReflectiveOperationException e) {
- throw new RuntimeException(e);
- }
- }
- return map;
- }
+ public ArrayMap<String, String> getProjectionMap(Class<?>... clazzes) {
+ return mExternalDatabase.getProjectionMap(clazzes);
}
static <T> boolean containsAny(Set<T> a, Set<T> b) {
diff --git a/src/com/android/providers/media/MediaService.java b/src/com/android/providers/media/MediaService.java
index 505f8b8..4c31c9f 100644
--- a/src/com/android/providers/media/MediaService.java
+++ b/src/com/android/providers/media/MediaService.java
@@ -16,9 +16,9 @@
package com.android.providers.media;
-import static com.android.providers.media.MediaProvider.TAG;
import static com.android.providers.media.scan.MediaScanner.REASON_DEMAND;
import static com.android.providers.media.scan.MediaScanner.REASON_MOUNTED;
+import static com.android.providers.media.util.Logging.TAG;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
diff --git a/src/com/android/providers/media/MediaUpgradeReceiver.java b/src/com/android/providers/media/MediaUpgradeReceiver.java
index d15a2fe..cc39935 100644
--- a/src/com/android/providers/media/MediaUpgradeReceiver.java
+++ b/src/com/android/providers/media/MediaUpgradeReceiver.java
@@ -21,8 +21,11 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
+import android.provider.Column;
import android.util.Log;
+import com.android.providers.media.util.Metrics;
+
import java.io.File;
/**
@@ -66,7 +69,7 @@
try {
DatabaseHelper helper = new DatabaseHelper(
context, file, MediaProvider.isInternalMediaDatabaseName(file),
- false, false);
+ false, false, Column.class, Metrics::logSchemaChange);
db = helper.getWritableDatabase();
} catch (Throwable t) {
Log.wtf(TAG, "Error during upgrade of media db " + file, t);
diff --git a/src/com/android/providers/media/PermissionActivity.java b/src/com/android/providers/media/PermissionActivity.java
index 837e127..49a0062 100644
--- a/src/com/android/providers/media/PermissionActivity.java
+++ b/src/com/android/providers/media/PermissionActivity.java
@@ -18,9 +18,9 @@
import static com.android.providers.media.MediaProvider.AUDIO_MEDIA_ID;
import static com.android.providers.media.MediaProvider.IMAGES_MEDIA_ID;
-import static com.android.providers.media.MediaProvider.TAG;
import static com.android.providers.media.MediaProvider.VIDEO_MEDIA_ID;
import static com.android.providers.media.MediaProvider.collectUris;
+import static com.android.providers.media.util.Logging.TAG;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/providers/media/util/DatabaseUtils.java b/src/com/android/providers/media/util/DatabaseUtils.java
index 21041ae..d432263 100644
--- a/src/com/android/providers/media/util/DatabaseUtils.java
+++ b/src/com/android/providers/media/util/DatabaseUtils.java
@@ -31,7 +31,7 @@
import static android.content.ContentResolver.QUERY_SORT_DIRECTION_ASCENDING;
import static android.content.ContentResolver.QUERY_SORT_DIRECTION_DESCENDING;
-import static com.android.providers.media.MediaProvider.TAG;
+import static com.android.providers.media.util.Logging.TAG;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -335,7 +335,7 @@
*/
public static void recoverAbusiveLimit(@NonNull Uri uri, @NonNull Bundle queryArgs) {
final String origLimit = queryArgs.getString(QUERY_ARG_SQL_LIMIT);
- final String uriLimit = uri.getQueryParameter(MediaStore.PARAM_LIMIT);
+ final String uriLimit = uri.getQueryParameter("limit");
if (!TextUtils.isEmpty(uriLimit)) {
// Yell if we already had a group by requested
diff --git a/src/com/android/providers/media/util/FileUtils.java b/src/com/android/providers/media/util/FileUtils.java
index 9f0b22cd..f371420 100644
--- a/src/com/android/providers/media/util/FileUtils.java
+++ b/src/com/android/providers/media/util/FileUtils.java
@@ -16,14 +16,16 @@
package com.android.providers.media.util;
-import static com.android.providers.media.MediaProvider.TAG;
+import static com.android.providers.media.util.Logging.TAG;
import android.content.ClipDescription;
+import android.content.ContentValues;
import android.content.Context;
import android.net.Uri;
import android.os.Environment;
import android.os.storage.StorageManager;
import android.provider.MediaStore;
+import android.provider.MediaStore.Images.ImageColumns;
import android.provider.MediaStore.MediaColumns;
import android.text.TextUtils;
import android.util.Log;
@@ -33,8 +35,6 @@
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import com.android.providers.media.scan.MediaScanner;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -463,8 +463,9 @@
}
/**
- * Return list of paths that should be scanned with {@link MediaScanner} for
- * the given volume name.
+ * Return list of paths that should be scanned with
+ * {@link com.android.providers.media.scan.MediaScanner} for the given
+ * volume name.
*/
public static @NonNull Collection<File> getVolumeScanPaths(@NonNull Context context,
@NonNull String volumeName) throws FileNotFoundException {
@@ -629,4 +630,32 @@
}
return null;
}
+
+ public static void computeDataValues(@NonNull ContentValues values) {
+ // Worst case we have to assume no bucket details
+ values.remove(ImageColumns.BUCKET_ID);
+ values.remove(ImageColumns.BUCKET_DISPLAY_NAME);
+ values.remove(ImageColumns.VOLUME_NAME);
+ values.remove(ImageColumns.RELATIVE_PATH);
+
+ final String data = values.getAsString(MediaColumns.DATA);
+ if (TextUtils.isEmpty(data)) return;
+
+ final File file = new File(data);
+ final File fileLower = new File(data.toLowerCase(Locale.ROOT));
+
+ values.put(ImageColumns.VOLUME_NAME, extractVolumeName(data));
+ values.put(ImageColumns.RELATIVE_PATH, extractRelativePath(data));
+ values.put(ImageColumns.DISPLAY_NAME, extractDisplayName(data));
+
+ // Buckets are the parent directory
+ final String parent = fileLower.getParent();
+ if (parent != null) {
+ values.put(ImageColumns.BUCKET_ID, parent.hashCode());
+ // The relative path for files in the top directory is "/"
+ if (!"/".equals(values.getAsString(ImageColumns.RELATIVE_PATH))) {
+ values.put(ImageColumns.BUCKET_DISPLAY_NAME, file.getParentFile().getName());
+ }
+ }
+ }
}
diff --git a/src/com/android/providers/media/util/Logging.java b/src/com/android/providers/media/util/Logging.java
new file mode 100644
index 0000000..8a04060
--- /dev/null
+++ b/src/com/android/providers/media/util/Logging.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.providers.media.util;
+
+import android.util.Log;
+
+public class Logging {
+ public static final String TAG = "MediaProvider";
+ public static final boolean LOGW = Log.isLoggable(TAG, Log.WARN);
+ public static final boolean LOGD = Log.isLoggable(TAG, Log.DEBUG);
+ public static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);
+}
diff --git a/tests/Android.bp b/tests/Android.bp
index 923a03a..9d355cd 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,3 +1,8 @@
+// This looks a bit awkward, but we need our tests to run against either
+// MediaProvider or MediaProviderGoogle, and we don't know which one is
+// on the device being tested, so we can't sign our tests with a key that
+// will allow instrumentation. Thus we pull all the sources we need to
+// run tests against into the test itself.
android_test {
name: "MediaProviderTests",
test_suites: [
@@ -7,7 +12,12 @@
manifest: "AndroidManifest.xml",
+ resource_dirs: [
+ "main_res",
+ "res",
+ ],
srcs: [
+ ":mediaprovider-sources",
"src/**/*.java",
],
@@ -18,11 +28,14 @@
],
static_libs: [
+ "androidx.appcompat_appcompat",
+ "androidx.core_core",
"androidx.test.rules",
+ "guava",
"mockito-target",
],
certificate: "media",
- instrumentation_for: "MediaProvider",
+ aaptflags: ["--custom-package com.android.providers.media"],
}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 70e7bb1..f4baf43 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -2,12 +2,15 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.providers.media.tests">
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
<application android:label="MediaProvider Tests">
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.providers.media"
+ android:targetPackage="com.android.providers.media.tests"
android:label="MediaProvider Tests" />
</manifest>
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index d05ca2a..c4e5dcc 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -16,6 +16,7 @@
<configuration description="Runs Tests for MediaProvder.">
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="test-file-name" value="MediaProviderTests.apk" />
+ <option name="install-arg" value="-g" />
</target_preparer>
<option name="test-suite-tag" value="apct" />
diff --git a/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java b/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
index 2df79d0..32e5fe3 100644
--- a/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
+++ b/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
@@ -30,14 +30,18 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
+import android.os.Environment;
import android.os.ParcelFileDescriptor;
+import android.os.storage.StorageManager;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import android.provider.MediaStore.Audio.AudioColumns;
import android.provider.MediaStore.DownloadColumns;
+import android.provider.MediaStore.Files.FileColumns;
import android.provider.MediaStore.MediaColumns;
import android.provider.MediaStore.Video.VideoColumns;
import android.util.Log;
+import android.webkit.MimeTypeMap;
import androidx.annotation.NonNull;
import androidx.test.InstrumentationRegistry;
@@ -84,66 +88,71 @@
mExternalDownloads = MediaStore.Downloads.getContentUri(mVolumeName);
}
- @Test
- public void testLegacy_Pending() throws Exception {
+ private ContentValues generateValues(int mediaType, String mimeType, String dirName) {
+ final Context context = InstrumentationRegistry.getContext();
+
+ final File dir = context.getSystemService(StorageManager.class)
+ .getStorageVolume(MediaStore.Files.getContentUri(mVolumeName)).getDirectory();
+ final File subDir = new File(dir, dirName);
+ final File file = new File(subDir, "legacy" + System.nanoTime() + "."
+ + MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType));
+
final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".png");
- values.put(MediaColumns.MIME_TYPE, "image/png");
+ values.put(FileColumns.MEDIA_TYPE, mediaType);
+ values.put(MediaColumns.DATA, file.getAbsolutePath());
+ values.put(MediaColumns.MIME_TYPE, mimeType);
+ values.put(MediaColumns.VOLUME_NAME, mVolumeName);
+ values.put(MediaColumns.DATE_ADDED, String.valueOf(System.currentTimeMillis() / 1_000));
values.put(MediaColumns.OWNER_PACKAGE_NAME,
InstrumentationRegistry.getContext().getPackageName());
+ return values;
+ }
+
+ @Test
+ public void testLegacy_Pending() throws Exception {
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_IMAGE,
+ "image/png", Environment.DIRECTORY_PICTURES);
values.put(MediaColumns.IS_PENDING, String.valueOf(1));
+ values.put(MediaColumns.DATE_EXPIRES, String.valueOf(System.currentTimeMillis() / 1_000));
doLegacy(mExternalImages, values);
}
@Test
public void testLegacy_Trashed() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".png");
- values.put(MediaColumns.MIME_TYPE, "image/png");
- values.put(MediaColumns.OWNER_PACKAGE_NAME,
- InstrumentationRegistry.getContext().getPackageName());
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_IMAGE,
+ "image/png", Environment.DIRECTORY_PICTURES);
values.put(MediaColumns.IS_TRASHED, String.valueOf(1));
doLegacy(mExternalImages, values);
}
@Test
public void testLegacy_Favorite() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".png");
- values.put(MediaColumns.MIME_TYPE, "image/png");
- values.put(MediaColumns.OWNER_PACKAGE_NAME,
- InstrumentationRegistry.getContext().getPackageName());
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_IMAGE,
+ "image/png", Environment.DIRECTORY_PICTURES);
values.put(MediaColumns.IS_FAVORITE, String.valueOf(1));
doLegacy(mExternalImages, values);
}
@Test
public void testLegacy_Orphaned() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".png");
- values.put(MediaColumns.MIME_TYPE, "image/png");
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_IMAGE,
+ "image/png", Environment.DIRECTORY_PICTURES);
values.putNull(MediaColumns.OWNER_PACKAGE_NAME);
doLegacy(mExternalImages, values);
}
@Test
public void testLegacy_Audio() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".mp3");
- values.put(MediaColumns.MIME_TYPE, "audio/mpeg");
- values.put(MediaColumns.OWNER_PACKAGE_NAME,
- InstrumentationRegistry.getContext().getPackageName());
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_AUDIO,
+ "audio/mpeg", Environment.DIRECTORY_MUSIC);
values.put(AudioColumns.BOOKMARK, String.valueOf(42));
doLegacy(mExternalAudio, values);
}
@Test
public void testLegacy_Video() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".mp4");
- values.put(MediaColumns.MIME_TYPE, "video/mp4");
- values.put(MediaColumns.OWNER_PACKAGE_NAME,
- InstrumentationRegistry.getContext().getPackageName());
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_VIDEO,
+ "video/mpeg", Environment.DIRECTORY_MOVIES);
values.put(VideoColumns.BOOKMARK, String.valueOf(42));
values.put(VideoColumns.TAGS, "My Tags");
values.put(VideoColumns.CATEGORY, "My Category");
@@ -152,19 +161,15 @@
@Test
public void testLegacy_Image() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".png");
- values.put(MediaColumns.MIME_TYPE, "image/png");
- values.put(MediaColumns.OWNER_PACKAGE_NAME,
- InstrumentationRegistry.getContext().getPackageName());
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_IMAGE,
+ "image/png", Environment.DIRECTORY_PICTURES);
doLegacy(mExternalImages, values);
}
@Test
public void testLegacy_Download() throws Exception {
- final ContentValues values = new ContentValues();
- values.put(MediaColumns.DISPLAY_NAME, "test" + System.nanoTime() + ".iso");
- values.put(MediaColumns.MIME_TYPE, "application/x-iso9660-image");
+ final ContentValues values = generateValues(FileColumns.MEDIA_TYPE_NONE,
+ "application/x-iso9660-image", Environment.DIRECTORY_DOWNLOADS);
values.put(DownloadColumns.DOWNLOAD_URI, "http://example.com/download");
values.put(DownloadColumns.REFERER_URI, "http://example.com/referer");
doLegacy(mExternalDownloads, values);
@@ -190,18 +195,14 @@
try (ContentProviderClient legacy = context.getContentResolver()
.acquireContentProviderClient(MediaStore.AUTHORITY_LEGACY)) {
legacyUri = rewriteToLegacy(legacy.insert(rewriteToLegacy(collectionUri), values));
-
- try (Cursor cursor = legacy.query(legacyUri, null, null, null)) {
- assertTrue(cursor.moveToFirst());
- copyFromCursorToContentValues(MediaColumns._ID, cursor, values);
- copyFromCursorToContentValues(MediaColumns.DATA, cursor, values);
- copyFromCursorToContentValues(MediaColumns.DATE_ADDED, cursor, values);
- }
-
- try (ParcelFileDescriptor pfd = legacy.openFile(legacyUri, "rw")) {
- }
-
legacyFile = new File(values.getAsString(MediaColumns.DATA));
+
+ // Remember our ID to check it later
+ values.put(MediaColumns._ID, legacyUri.getLastPathSegment());
+
+ // Drop media type from the columns we check, since it's implicitly
+ // verified via the collection Uri
+ values.remove(FileColumns.MEDIA_TYPE);
}
// Clear data on the modern provider so that the initial scan recovers
diff --git a/tests/main_res b/tests/main_res
new file mode 120000
index 0000000..dbbfe3c
--- /dev/null
+++ b/tests/main_res
@@ -0,0 +1 @@
+../res/
\ No newline at end of file
diff --git a/tests/src/com/android/providers/media/DatabaseHelperTest.java b/tests/src/com/android/providers/media/DatabaseHelperTest.java
index 27128c9..5e4e308 100644
--- a/tests/src/com/android/providers/media/DatabaseHelperTest.java
+++ b/tests/src/com/android/providers/media/DatabaseHelperTest.java
@@ -23,11 +23,11 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
+import android.provider.Column;
import android.provider.MediaStore.Files.FileColumns;
import android.util.Log;
@@ -303,7 +303,7 @@
private static class DatabaseHelperO extends DatabaseHelper {
public DatabaseHelperO(Context context, String name) {
- super(context, name, DatabaseHelper.VERSION_O, false, false, true);
+ super(context, name, DatabaseHelper.VERSION_O, false, false, true, Column.class, null);
}
@Override
@@ -314,7 +314,7 @@
private static class DatabaseHelperP extends DatabaseHelper {
public DatabaseHelperP(Context context, String name) {
- super(context, name, DatabaseHelper.VERSION_P, false, false, true);
+ super(context, name, DatabaseHelper.VERSION_P, false, false, true, Column.class, null);
}
@Override
@@ -325,7 +325,7 @@
private static class DatabaseHelperQ extends DatabaseHelper {
public DatabaseHelperQ(Context context, String name) {
- super(context, name, DatabaseHelper.VERSION_Q, false, false, true);
+ super(context, name, DatabaseHelper.VERSION_Q, false, false, true, Column.class, null);
}
@Override
@@ -336,7 +336,7 @@
private static class DatabaseHelperR extends DatabaseHelper {
public DatabaseHelperR(Context context, String name) {
- super(context, name, DatabaseHelper.VERSION_R, false, false, true);
+ super(context, name, DatabaseHelper.VERSION_R, false, false, true, Column.class, null);
}
}
diff --git a/tests/src/com/android/providers/media/IdleServiceTest.java b/tests/src/com/android/providers/media/IdleServiceTest.java
index 7b319ec..806c532 100644
--- a/tests/src/com/android/providers/media/IdleServiceTest.java
+++ b/tests/src/com/android/providers/media/IdleServiceTest.java
@@ -37,8 +37,9 @@
import com.android.providers.media.scan.MediaScannerTest;
import com.android.providers.media.scan.MediaScannerTest.IsolatedContext;
-import com.android.providers.media.tests.R;
+import com.android.providers.media.R;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -50,6 +51,7 @@
private static final String TAG = MediaProviderTest.TAG;
@Test
+ @Ignore("Enable as part of b/142561358")
public void testPruneThumbnails() throws Exception {
final Context context = InstrumentationRegistry.getTargetContext();
final Context isolatedContext = new IsolatedContext(context, "modern");
diff --git a/tests/src/com/android/providers/media/MediaProviderTest.java b/tests/src/com/android/providers/media/MediaProviderTest.java
index ff80b80..96479c6 100644
--- a/tests/src/com/android/providers/media/MediaProviderTest.java
+++ b/tests/src/com/android/providers/media/MediaProviderTest.java
@@ -48,6 +48,7 @@
import com.android.providers.media.scan.MediaScannerTest.IsolatedContext;
import com.android.providers.media.util.FileUtils;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -199,6 +200,7 @@
}
@Test
+ @Ignore("Enable as part of b/142561358")
public void testBuildData_Secondary() throws Exception {
final Uri uri = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
assertEndsWith("/Pictures/Screenshots/foo.png",
@@ -241,6 +243,7 @@
}
@Test
+ @Ignore("Enable as part of b/142561358")
public void testBuildData_Charset() throws Exception {
final Uri uri = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
assertEndsWith("/Pictures/foo__bar/bar__baz.png",
@@ -541,7 +544,7 @@
private static ContentValues computeDataValues(String path) {
final ContentValues values = new ContentValues();
values.put(MediaColumns.DATA, path);
- MediaProvider.computeDataValues(values);
+ FileUtils.computeDataValues(values);
Log.v(TAG, "Computed values " + values);
return values;
}
diff --git a/tests/src/com/android/providers/media/scan/DrmTest.java b/tests/src/com/android/providers/media/scan/DrmTest.java
index fa9d892..47cf150 100644
--- a/tests/src/com/android/providers/media/scan/DrmTest.java
+++ b/tests/src/com/android/providers/media/scan/DrmTest.java
@@ -36,7 +36,7 @@
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
-import com.android.providers.media.tests.R;
+import com.android.providers.media.R;
import com.android.providers.media.util.DatabaseUtils;
import com.android.providers.media.util.FileUtils;
diff --git a/tests/src/com/android/providers/media/scan/MediaScannerTest.java b/tests/src/com/android/providers/media/scan/MediaScannerTest.java
index ecaac54..4c72ca6 100644
--- a/tests/src/com/android/providers/media/scan/MediaScannerTest.java
+++ b/tests/src/com/android/providers/media/scan/MediaScannerTest.java
@@ -44,7 +44,7 @@
import androidx.test.runner.AndroidJUnit4;
import com.android.providers.media.MediaProvider;
-import com.android.providers.media.tests.R;
+import com.android.providers.media.R;
import com.android.providers.media.util.FileUtils;
import org.junit.Before;
diff --git a/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java b/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
index 323307f..37b18ae 100644
--- a/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
+++ b/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
@@ -45,7 +45,7 @@
import androidx.test.runner.AndroidJUnit4;
import com.android.providers.media.scan.MediaScannerTest.IsolatedContext;
-import com.android.providers.media.tests.R;
+import com.android.providers.media.R;
import com.android.providers.media.util.FileUtils;
import org.junit.After;
@@ -69,11 +69,12 @@
@Before
public void setUp() {
- mDir = new File(Environment.getExternalStorageDirectory(), "test_" + System.nanoTime());
+ final Context context = InstrumentationRegistry.getTargetContext();
+
+ mDir = new File(context.getExternalMediaDirs()[0], "test_" + System.nanoTime());
mDir.mkdirs();
FileUtils.deleteContents(mDir);
- final Context context = InstrumentationRegistry.getTargetContext();
mIsolatedContext = new IsolatedContext(context, "modern");
mIsolatedResolver = mIsolatedContext.getContentResolver();
diff --git a/tests/src/com/android/providers/media/util/IsoInterfaceTest.java b/tests/src/com/android/providers/media/util/IsoInterfaceTest.java
index b4fcf38..912bf20 100644
--- a/tests/src/com/android/providers/media/util/IsoInterfaceTest.java
+++ b/tests/src/com/android/providers/media/util/IsoInterfaceTest.java
@@ -23,7 +23,7 @@
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
-import com.android.providers.media.tests.R;
+import com.android.providers.media.R;
import com.android.providers.media.util.FileUtils;
import com.android.providers.media.util.IsoInterface;
import com.android.providers.media.util.XmpInterface;
diff --git a/tests/src/com/android/providers/media/util/XmpInterfaceTest.java b/tests/src/com/android/providers/media/util/XmpInterfaceTest.java
index 386daab..e9876a3 100644
--- a/tests/src/com/android/providers/media/util/XmpInterfaceTest.java
+++ b/tests/src/com/android/providers/media/util/XmpInterfaceTest.java
@@ -29,7 +29,7 @@
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
-import com.android.providers.media.tests.R;
+import com.android.providers.media.R;
import com.android.providers.media.util.FileUtils;
import com.android.providers.media.util.IsoInterface;
import com.android.providers.media.util.XmpInterface;