am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev

* commit '129f1946a1bc32ac519334283538c9e24588e998':
  Prevent index out of bounds when using String.substring.

1 files changed, 3 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index ef87eccb2ef0..257cbd0df1c1 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -275,9 +275,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
                         } else {
                             mWallpaper.lastDiedTime = SystemClock.uptimeMillis();
                         }
+                        final String flattened = name.flattenToString();
                         EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED,
-                                name.flattenToString().substring(0,
-                                        MAX_WALLPAPER_COMPONENT_LOG_LENGTH));
+                                flattened.substring(0, Math.min(flattened.length(),
+                                        MAX_WALLPAPER_COMPONENT_LOG_LENGTH)));
                     }
                 }
             }