3 files changed, 90 insertions, 2 deletions
diff --git a/androidx/core/content/pm/PackageInfoCompat.java b/androidx/core/content/pm/PackageInfoCompat.java
new file mode 100644
index 00000000..71c53f22
--- /dev/null
+++ b/androidx/core/content/pm/PackageInfoCompat.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.core.content.pm;
+
+import android.content.pm.PackageInfo;
+
+import androidx.annotation.NonNull;
+import androidx.core.os.BuildCompat;
+
+/** Helper for accessing features in {@link PackageInfo}. */
+public final class PackageInfoCompat {
+    /**
+     * Return {@link android.R.attr#versionCode} and {@link android.R.attr#versionCodeMajor}
+     * combined together as a single long value. The {@code versionCodeMajor} is placed in the
+     * upper 32 bits on Android P or newer, otherwise these bits are all set to 0.
+     *
+     * @see PackageInfo#getLongVersionCode()
+     */
+    public static long getLongVersionCode(@NonNull PackageInfo info) {
+        if (BuildCompat.isAtLeastP()) {
+            return info.getLongVersionCode();
+        }
+
+        return info.versionCode;
+    }
+
+    private PackageInfoCompat() {
+    }
+}
diff --git a/androidx/core/content/pm/PackageInfoCompatTest.java b/androidx/core/content/pm/PackageInfoCompatTest.java
new file mode 100644
index 00000000..e3e55047
--- /dev/null
+++ b/androidx/core/content/pm/PackageInfoCompatTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.core.content.pm;
+
+import static android.os.Build.VERSION_CODES.P;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.pm.PackageInfo;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.SmallTest;
+
+import org.junit.Test;
+
+@SmallTest
+public final class PackageInfoCompatTest {
+    @Test
+    public void getLongVersionCodeLowerBitsOnly() {
+        PackageInfo info = new PackageInfo();
+        info.versionCode = 12345;
+
+        assertEquals(12345L, PackageInfoCompat.getLongVersionCode(info));
+    }
+
+    @SdkSuppress(minSdkVersion = P)
+    @Test
+    public void getLongVersionCodeLowerAndUpperBits() {
+        PackageInfo info = new PackageInfo();
+        info.setLongVersionCode(Long.MAX_VALUE);
+
+        assertEquals(Long.MAX_VALUE, PackageInfoCompat.getLongVersionCode(info));
+    }
+}
diff --git a/androidx/core/content/pm/ShortcutInfoCompat.java b/androidx/core/content/pm/ShortcutInfoCompat.java
index 7eea5519..67415acf 100644
--- a/androidx/core/content/pm/ShortcutInfoCompat.java
+++ b/androidx/core/content/pm/ShortcutInfoCompat.java
@@ -26,7 +26,6 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.drawable.IconCompat;
 
 import java.util.Arrays;
@@ -74,7 +73,6 @@ public class ShortcutInfoCompat {
         return builder.build();
     }
 
-    @VisibleForTesting
     Intent addToIntent(Intent outIntent) {
         outIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, mIntents[mIntents.length - 1])
                 .putExtra(Intent.EXTRA_SHORTCUT_NAME, mLabel.toString());