Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a0cebca authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

am e5a8dd22: am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when... 

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

* commit 'e5a8dd22':
  Prevent index out of bounds when using String.substring.
parents d060a29e e5a8dd22

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -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)));

                    }

                    }

                }

                }

            }

            }