Merge "BitUtils: support packing/unpacking negative long values" am: 9e5de85e21 am: 04cad88eee

am: 039b4745a7

Change-Id: Iaa8c4084f0754781ea3e6a0a9202d9e102d5f074

1 files changed, 3 insertions, 3 deletions

diff --git a/core/java/com/android/internal/util/BitUtils.java b/core/java/com/android/internal/util/BitUtils.java
index b4bab809cc00..154ea52bf9ba 100644
--- a/core/java/com/android/internal/util/BitUtils.java
+++ b/core/java/com/android/internal/util/BitUtils.java
@@ -68,9 +68,9 @@ public final class BitUtils {
         int[] result = new int[size];
         int index = 0;
         int bitPos = 0;
-        while (val > 0) {
+        while (val != 0) {
             if ((val & 1) == 1) result[index++] = bitPos;
-            val = val >> 1;
+            val = val >>> 1;
             bitPos++;
         }
         return result;
@@ -79,7 +79,7 @@ public final class BitUtils {
     public static long packBits(int[] bits) {
         long packed = 0;
         for (int b : bits) {
-            packed |= (1 << b);
+            packed |= (1L << b);
         }
         return packed;
     }