Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev

Author: Jim Miller

core/java/com/android/internal/widget/LockPatternUtils.java

@@ -1167,6 +1167,10 @@ public boolean addAppWidget(int widgetId, int index) {
     public boolean removeAppWidget(int widgetId) {
         int[] widgets = getAppWidgets();
 
+        if (widgets.length == 0) {
+            return false;
+        }
+
         int[] newWidgets = new int[widgets.length - 1];
         for (int i = 0, j = 0; i < widgets.length; i++) {
             if (widgets[i] == widgetId) {
@@ -1331,7 +1335,7 @@ public void setPowerButtonInstantlyLocks(boolean enabled) {
     public boolean getPowerButtonInstantlyLocks() {
         return getBoolean(LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS, true);
     }
-    
+
     public static boolean isSafeModeEnabled() {
         try {
             return IWindowManager.Stub.asInterface(