Not sending my uid as ORIGINATING_UID to package installer

In some cases the UID column may have download provider uid. We should
not send this as the originating uid for blaming app installs.

Test: Manually copied an apk to internal storage and back to downloads.
Tapping on apk launches package installer as expected.

Fixes: 38310830

Change-Id: Ie75da734b1bd43bc61112c023cb1587e4c2ff20e

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/providers/downloads/OpenHelper.java b/src/com/android/providers/downloads/OpenHelper.java
index 31561ff2..c88902b7 100644
--- a/src/com/android/providers/downloads/OpenHelper.java
+++ b/src/com/android/providers/downloads/OpenHelper.java
@@ -31,6 +31,7 @@ import android.content.Intent;
 import android.content.pm.PackageInstaller;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Process;
 import android.provider.DocumentsContract;
 import android.provider.Downloads.Impl.RequestHeaders;
 import android.util.Log;
@@ -127,7 +128,10 @@ public class OpenHelper {
         if (cursor != null) {
             try {
                 if (cursor.moveToFirst()) {
-                    return cursor.getInt(cursor.getColumnIndexOrThrow(Constants.UID));
+                    final int uid = cursor.getInt(cursor.getColumnIndexOrThrow(Constants.UID));
+                    if (uid != Process.myUid()) {
+                        return uid;
+                    }
                 }
             } finally {
                 cursor.close();