1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/wear/WearPackageUtil.java b/src/com/android/packageinstaller/wear/WearPackageUtil.java
index 688d6167..e340d627 100644
--- a/src/com/android/packageinstaller/wear/WearPackageUtil.java
+++ b/src/com/android/packageinstaller/wear/WearPackageUtil.java
@@ -16,11 +16,11 @@
 
 package com.android.packageinstaller.wear;
 
-import android.annotation.Nullable;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageParser;
+import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.system.ErrnoException;
 import android.system.Os;
@@ -86,7 +86,7 @@ public class WearPackageUtil {
      *                       decompress it here
      */
     public static File getFileFromFd(Context context, ParcelFileDescriptor fd,
-            String packageName, @Nullable String compressionAlg) {
+            String packageName, String compressionAlg) {
         File newFile = getTemporaryFile(context, packageName);
         if (fd == null || fd.getFileDescriptor() == null)  {
             return null;
@@ -164,4 +164,16 @@ public class WearPackageUtil {
                 + " for " + wearablePackageName);
         context.startService(newIntent);
     }
+
+    /**
+     * @return com.google.com from expected formats like
+     * Uri: package:com.google.com, package:/com.google.com, package://com.google.com
+     */
+    public static String getSanitizedPackageName(Uri packageUri) {
+        String packageName = packageUri.getEncodedSchemeSpecificPart();
+        if (packageName != null) {
+            return packageName.replaceAll("^/+", "");
+        }
+        return packageName;
+    }
 }