Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '129f1946a1bc32ac519334283538c9e24588e998':
  Prevent index out of bounds when using String.substring.
This commit is contained in:
Filip Gruszczynski
2014-10-14 22:04:05 +00:00
committed by Android Git Automerger
parent 2079133871 129f1946a1
commit 3d5ecf13e0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -275,9 +275,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
} else { } else {
mWallpaper.lastDiedTime = SystemClock.uptimeMillis(); mWallpaper.lastDiedTime = SystemClock.uptimeMillis();
} }
final String flattened = name.flattenToString();
EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED, EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED,
name.flattenToString().substring(0, flattened.substring(0, Math.min(flattened.length(),
MAX_WALLPAPER_COMPONENT_LOG_LENGTH)); MAX_WALLPAPER_COMPONENT_LOG_LENGTH)));
} }
} }
} }