commit b0b37a4b5a0597fc5c46a2426ddd0f2e87a06a5f
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 02 11:28:31 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 02 11:28:31 2022 +0000
tree ee29bf425042e47601bff514cbbf54c7bacd1ae7
parent dafd5e41f13d2e0a5c5631241fb3bc1488865b5f
parent fd9437135efb8b1200df38cc242bcdebf60fb23f

Merge "fix: Include new WIDTH,HEIGHT,ORIENTATION in all." into tm-mainline-prod

apex/framework/java/android/provider/CloudMediaProviderContract.java

diff --git a/apex/framework/java/android/provider/CloudMediaProviderContract.java b/apex/framework/java/android/provider/CloudMediaProviderContract.java
index 9f9b54e..902b175 100644
--- a/apex/framework/java/android/provider/CloudMediaProviderContract.java
+++ b/apex/framework/java/android/provider/CloudMediaProviderContract.java
@@ -240,6 +240,9 @@
             MEDIA_STORE_URI,
             DURATION_MILLIS,
             IS_FAVORITE,
+            WIDTH,
+            HEIGHT,
+            ORIENTATION,
             DATA,
             AUTHORITY,
         };

tests/src/com/android/providers/media/photopicker/data/model/ItemTest.java

diff --git a/tests/src/com/android/providers/media/photopicker/data/model/ItemTest.java b/tests/src/com/android/providers/media/photopicker/data/model/ItemTest.java
index 6ff2c3d..408278a 100644
--- a/tests/src/com/android/providers/media/photopicker/data/model/ItemTest.java
+++ b/tests/src/com/android/providers/media/photopicker/data/model/ItemTest.java
@@ -302,17 +302,22 @@
             long generationModified, long duration, int specialFormat) {
         final MatrixCursor cursor = new MatrixCursor(MediaColumns.ALL_PROJECTION);
         cursor.addRow(new Object[] {
-                    id,
-                    dateTaken,
-                    generationModified,
-                    mimeType,
-                    specialFormat,
-                    "1", // size_bytes
-                    null, // media_store_uri
-                    duration,
-                    "0", // is_favorite
-                    "/storage/emulated/0/foo", // data
-                    PickerSyncController.LOCAL_PICKER_PROVIDER_AUTHORITY});
+                id,
+                dateTaken,
+                generationModified,
+                mimeType,
+                specialFormat,
+                "1", // size_bytes
+                null, // media_store_uri
+                duration,
+                "0", // is_favorite
+                800, // width
+                500, // height
+                0, // orientation
+                "/storage/emulated/0/foo", // data
+                PickerSyncController.LOCAL_PICKER_PROVIDER_AUTHORITY
+                }
+        );
         return cursor;
     }
 }