diff options
| author | 2019-10-16 19:22:50 +0000 | |
|---|---|---|
| committer | 2019-10-16 19:22:50 +0000 | |
| commit | 1ec87b3c86fcec770fbfce5d182219e3263236a8 (patch) | |
| tree | a49d4abeeae392eaba11a2cf3660552fbe033e09 | |
| parent | a9da1921f05a09bed597cb4c6b13d9e55f384e8c (diff) | |
| parent | 699c1e4e0c3e064fe0e9a611d219bd0c5becb44d (diff) | |
Merge "Allow somewhat larger RemoteViews"
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rwxr-xr-x | services/core/java/com/android/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 56052464af06..9bff88a57232 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4319,11 +4319,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 ca979f8b13cc..cd3343bbec7b 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -5112,8 +5112,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; |