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

* commit 'e5a8dd222ab31d63c4f38fd87f909264f024530d':
  Prevent index out of bounds when using String.substring.
This commit is contained in:
Filip Gruszczynski
2014-10-15 02:04:13 +00:00
committed by Android Git Automerger

View File

@@ -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)));
}
}
}