commit 7d29f33090248d98b11dd6cb709a62c5fbbb4b34
author Chong Zhang <chz@google.com> Fri Nov 02 17:24:04 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 02 17:24:04 2018 +0000
tree 3e168dee84db96004755dff1dd53630b851d5639
parent 14f6d670182c0691a949506500406ad494cf185a
parent 379b7f0f4fd7007e604c94da8101ca8e2d38971a

Merge "Reland "Add columns for color aspects to database"""

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 493a3a3..98d295c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
         package="com.android.providers.media"
         android:sharedUserId="android.media"
         android:sharedUserLabel="@string/uid_label"
-        android:versionCode="900">
+        android:versionCode="1000">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 279c1ac..9de840c 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -821,7 +821,8 @@
                 + "duration INTEGER,bookmark INTEGER,artist TEXT,album TEXT,resolution TEXT,"
                 + "tags TEXT,category TEXT,language TEXT,mini_thumb_data TEXT,name TEXT,"
                 + "media_type INTEGER,old_id INTEGER,is_drm INTEGER,"
-                + "width INTEGER, height INTEGER, title_resource_uri TEXT)");
+                + "width INTEGER, height INTEGER, title_resource_uri TEXT,"
+                + "color_standard INTEGER, color_transfer INTEGER, color_range INTEGER)");
         db.execSQL("CREATE TABLE log (time DATETIME, message TEXT)");
         if (!internal) {
             db.execSQL("CREATE TABLE audio_genres (_id INTEGER PRIMARY KEY,name TEXT NOT NULL)");
@@ -925,6 +926,7 @@
         db.execSQL("DELETE from artists");
         db.execSQL("ALTER TABLE files ADD COLUMN title_resource_uri TEXT DEFAULT NULL");
         db.execSQL("UPDATE files SET date_modified=0");
+        updateFromPISchema(db);
     }
 
     private static void updateFromOCSchema(SQLiteDatabase db) {
@@ -933,6 +935,14 @@
         db.execSQL("ALTER TABLE files ADD COLUMN title_resource_uri TEXT DEFAULT NULL");
         db.execSQL("UPDATE files SET date_modified=0"
                 + " WHERE (is_alarm IS 1) OR (is_ringtone IS 1) OR (is_notification IS 1)");
+        updateFromPISchema(db);
+    }
+
+    private static void updateFromPISchema(SQLiteDatabase db) {
+        // Add the color aspects related column used for HDR detection etc.
+        db.execSQL("ALTER TABLE files ADD COLUMN color_standard INTEGER;");
+        db.execSQL("ALTER TABLE files ADD COLUMN color_transfer INTEGER;");
+        db.execSQL("ALTER TABLE files ADD COLUMN color_range INTEGER;");
     }
 
     /**
@@ -965,6 +975,8 @@
             updateFromKKSchema(db);
         } else if (fromVersion < 900) {
             updateFromOCSchema(db);
+        } else if (fromVersion < 1000) {
+            updateFromPISchema(db);
         }
 
         sanityCheck(db, fromVersion);