diff options
| author | Xin Li <delphij@google.com> | 2022-03-08 00:17:40 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-03-08 00:17:40 +0000 |
| commit | 752369949bbcfede8d3d15dbea75fd753a637c12 (patch) | |
| tree | 30da0899c053e1bd304954394b191b242bae4bd0 | |
| parent | b59877b659f1e1925938f58fafde71e40becc051 (diff) | |
| parent | ee5e07ca3d293db7fdfb9350c2b1cf63115f3fbd (diff) | |
| download | robolectric-shadows-752369949bbcfede8d3d15dbea75fd753a637c12.tar.gz | |
Merge Android 12L
Bug: 222710654
Merged-In: I98027b4a32f09657b009128742dbebc670f4dc70
Change-Id: I13c9832ac43f031f316c7f5f45049883db7b8e7b
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | resources/src/main/java/org/robolectric/res/android/ByteBucketArray.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 66396d69c..37796318e 100644 --- a/Android.bp +++ b/Android.bp @@ -104,7 +104,7 @@ java_device_for_host { "services", "services.accessibility", "telephony-common", - + "android.car", ], } diff --git a/resources/src/main/java/org/robolectric/res/android/ByteBucketArray.java b/resources/src/main/java/org/robolectric/res/android/ByteBucketArray.java index 209fb1ee8..0636e1921 100644 --- a/resources/src/main/java/org/robolectric/res/android/ByteBucketArray.java +++ b/resources/src/main/java/org/robolectric/res/android/ByteBucketArray.java @@ -24,7 +24,7 @@ public abstract class ByteBucketArray<T> { } // byte bucketIndex = static_cast<byte>(index) >> 4; - byte bucketIndex = (byte) (index >> 4); + byte bucketIndex = (byte) (Byte.toUnsignedInt((byte) index) >> 4); T[] bucket = (T[]) mBuckets[bucketIndex]; if (bucket == null) { return mDefault; @@ -38,7 +38,7 @@ public abstract class ByteBucketArray<T> { // (uint32_t) index, (uint32_t) size()); // uint8_t bucketIndex = static_cast<uint8_t>(index) >> 4; - byte bucketIndex = (byte) (((byte) index) >> 4); + byte bucketIndex = (byte) (Byte.toUnsignedInt((byte) index) >> 4); Object[] bucket = mBuckets[bucketIndex]; if (bucket == null) { bucket = mBuckets[bucketIndex] = new Object[BUCKET_SIZE]; @@ -60,7 +60,7 @@ public abstract class ByteBucketArray<T> { } // editItemAt(index) = value; - byte bucketIndex = (byte) (((byte) index) >> 4); + byte bucketIndex = (byte) (Byte.toUnsignedInt((byte) index) >> 4); Object[] bucket = mBuckets[bucketIndex]; if (bucket == null) { bucket = mBuckets[bucketIndex] = new Object[BUCKET_SIZE]; |