Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev

2018-04-11 18:29:40 +00:00
parent 6f42d1bac2 5fa895ed7f
commit 9054656c20
1 changed files with 6 additions and 2 deletions
--- a/core/java/android/os/WorkSource.java
+++ b/core/java/android/os/WorkSource.java
@@ -924,13 +924,17 @@ public class WorkSource implements Parcelable {
        /** @hide */
        @VisibleForTesting
        public int[] getUids() {
-            return mUids;
+            int[] uids = new int[mSize];
+            System.arraycopy(mUids, 0, uids, 0, mSize);
+            return uids;
        }

        /** @hide */
        @VisibleForTesting
        public String[] getTags() {
-            return mTags;
+            String[] tags = new String[mSize];
+            System.arraycopy(mTags, 0, tags, 0, mSize);
+            return tags;
        }

        /** @hide */