From 699c1e4e0c3e064fe0e9a611d219bd0c5becb44d Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 9 Oct 2019 15:41:58 -0400
Subject: [PATCH] Allow somewhat larger RemoteViews

And improve logs

Test: manual
Bug: 136496704

Change-Id: I24d44c104188a2e335138358cff774660a824394
---
 core/res/res/values/config.xml                                | 4 ++--
 .../server/notification/NotificationManagerService.java       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 3fef7a2dffae1..03a8858d0de62 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4304,11 +4304,11 @@
 
     <!-- Trigger a warning for notifications with RemoteView objects that are larger in bytes than
     this value (default 1MB)-->
-    <integer name="config_notificationWarnRemoteViewSizeBytes">1000000</integer>
+    <integer name="config_notificationWarnRemoteViewSizeBytes">2000000</integer>
 
     <!-- Strip notification RemoteView objects that are larger in bytes than this value (also log)
     (default 2MB) -->
-    <integer name="config_notificationStripRemoteViewSizeBytes">2000000</integer>
+    <integer name="config_notificationStripRemoteViewSizeBytes">5000000</integer>
 
     <!-- Contains a blacklist of apps that should not get pre-installed carrier app permission
          grants, even if the UICC claims that the app should be privileged. See b/138150105 -->
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 4457e9c312d81..1c13e077c173f 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -5060,8 +5060,8 @@ public class NotificationManagerService extends SystemService {
         }
         if (contentViewSize >= mStripRemoteViewsSizeBytes) {
             mUsageStats.registerImageRemoved(pkg);
-            Slog.w(TAG,
-                    "Removed too large RemoteViews on pkg: " + pkg + " tag: " + tag + " id: " + id);
+            Slog.w(TAG, "Removed too large RemoteViews (" + contentViewSize + " bytes) on pkg: "
+                    + pkg + " tag: " + tag + " id: " + id);
             return true;
         }
         return false;