diff options
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 13 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 2988fb912..9079837b9 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -776,16 +776,21 @@ public final class Utilities { } public static boolean isBootCompleted() { + return "1".equals(getSystemProperty("sys.boot_completed", "1")); + } + + public static String getSystemProperty(String property, String defaultValue) { try { Class clazz = Class.forName("android.os.SystemProperties"); Method getter = clazz.getDeclaredMethod("get", String.class); - String value = (String) getter.invoke(null, "sys.boot_completed"); - return "1".equals(value); + String value = (String) getter.invoke(null, property); + if (!TextUtils.isEmpty(value)) { + return value; + } } catch (Exception e) { Log.d(TAG, "Unable to read system properties"); - // Assume that boot has completed - return true; } + return defaultValue; } /** diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 4c2d4bb92..88eeac677 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -624,8 +624,8 @@ public class Workspace extends PagedView ViewGroup.LayoutParams lp = qsbContainer.getLayoutParams(); if (cellHeight > 0 && lp.height != cellHeight) { lp.height = cellHeight; + qsbContainer.setLayoutParams(lp); } - qsbContainer.setLayoutParams(lp); } } |