commit 11fdc44c1e4fea46e214a65291376240d76f7284
author Bill Yi <byi@google.com> Thu Sep 17 21:57:24 2020 -0700
committer Bill Yi <byi@google.com> Thu Sep 17 21:57:24 2020 -0700
tree 37d3852d17af066ca1184cdbd8a01ba8e72cfc9a
parent 8e91010af975887a96a06004843b0d5210639c71
parent 4b54a06d697445c30189dd3f270e9f344133a456

Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I439dcaaa34979adff8ca260774e9b72833b5f291
Change-Id: I1ea6bc818dd01d60cd2fd47d740887b018841ed8

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 763e0ff..8b86b29 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
     <uses-permission android:name="android.permission.READ_PRINT_SERVICE_RECOMMENDATIONS" />
     <uses-permission android:name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON" />
-
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application

jni/Android.bp

diff --git a/jni/Android.bp b/jni/Android.bp
index d24e419..82bf3d6 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -58,6 +58,7 @@
         "plugins/wprint_scaler.c",
     ],
 
+    header_libs: ["jni_headers"],
     local_include_dirs: [
         "include",
         "plugins/genPCLm/inc",

res/values-si/strings.xml

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index af4c2d7..5758147 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -65,7 +65,7 @@
     <string name="recommendation_install_summary" msgid="374785283809791669">"ස්ථාපනය කිරීමට තෝරන්න"</string>
     <string name="recommendation_enable_summary" msgid="3500907868251326224">"සබල කිරීමට තෝරන්න"</string>
     <string name="recommendation_manage" msgid="4683640588502866284">"සේවා කළමණාකරණය කරන්න"</string>
-    <string name="security" msgid="2279008326210305401">"ආරක්‍ෂාව"</string>
+    <string name="security" msgid="2279008326210305401">"ආරක්ෂාව"</string>
     <string name="certificate_update_request" msgid="1314796413107139475">"මෙම මුද්‍රකය නව ආරක්‍ෂණ සහතිතකයක් සැපයුවේය, නැති නම් වෙනත් උපාංගයක් එය මූර්තිමත් කරයි. නව සහතිකය පිළිගන්නේද?"</string>
     <string name="not_encrypted_request" msgid="4871472176807381642">"මෙම මුද්‍රණ යන්ත්‍රය සංකේතනය කළ කාර්යයන් තවදුරටත් පිළිනොගනී. මුද්‍රණය කිරිම දිගටම කර ගෙන යන්නද?"</string>
     <string name="accept" msgid="4426153292469698134">"පිළිගන්න"</string>

src/com/android/bips/ImagePrintActivity.java

diff --git a/src/com/android/bips/ImagePrintActivity.java b/src/com/android/bips/ImagePrintActivity.java
index 8ff7ed5..765303a 100644
--- a/src/com/android/bips/ImagePrintActivity.java
+++ b/src/com/android/bips/ImagePrintActivity.java
@@ -24,6 +24,7 @@
 import android.graphics.Canvas;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
+import android.graphics.ColorSpace;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -118,6 +119,7 @@
                 // Publish progress and load for real
                 publishProgress(options.outHeight > options.outWidth);
                 options.inJustDecodeBounds = false;
+                options.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.SRGB);
                 return loadBitmap(uris[0], options);
             }
         }