commit 129f1946a1bc32ac519334283538c9e24588e998
author Filip Gruszczynski <gruszczy@google.com> Tue Oct 14 20:59:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 14 20:59:58 2014 +0000
tree 2c61ca7d011399300493e19bfad9e1c0ce384e18
parent 4bf0356ee2058c7f033a41e02fa3eb86909c450c
parent 5a589430b3be99a6fdaf03e621162d08c8b1ad8a

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

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index ef87ecc..257cbd0 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 @@
                         } 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)));
                     }
                 }
             }