am 0dd222ef: am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev

* commit '0dd222ef706eb4e1fdeaa7f2bf08f7254124ff11':
  Fixing bounds check.
This commit is contained in:
Sunny Goyal
2014-08-18 19:41:21 +00:00
committed by Android Git Automerger

View File

@@ -973,7 +973,7 @@ public class UserManager {
if (badgeLocation != null) {
if (badgeLocation.left < 0 || badgeLocation.top < 0
|| badgeLocation.right > badgedWidth || badgeLocation.bottom > badgedHeight) {
|| badgeLocation.width() > badgedWidth || badgeLocation.height() > badgedHeight) {
throw new IllegalArgumentException("Badge location " + badgeLocation
+ " not in badged drawable bounds "
+ new Rect(0, 0, badgedWidth, badgedHeight));