Merge cherrypicks of [2891339, 2891340, 2891341, 2891342, 2891354, 2891355, 2891356, 2891357, 2891343, 2892569, 2891358, 2891359, 2891361, 2891362, 2891363, 2891364, 2891365, 2891366, 2891367, 2891368, 2892589, 2892590, 2892591, 2892592, 2892473, 2891272, 2891197, 2892597, 2890868, 2892600, 2892629, 2891198, 2891199, 2891200, 2891201, 2891202, 2891203, 2891204] into mnc-mr2-release
Change-Id: I5e844f94947f512a955f8813bbb0c95ff046405b
diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java
index cff601c..6eb5d24 100644
--- a/src/com/android/nfc/BeamShareActivity.java
+++ b/src/com/android/nfc/BeamShareActivity.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -26,6 +28,7 @@
import android.content.ClipData;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.pm.PackageManager;
import android.net.Uri;
import android.nfc.BeamShareData;
import android.nfc.NdefMessage;
@@ -33,8 +36,11 @@
import android.nfc.NfcAdapter;
import android.os.Bundle;
import android.os.UserHandle;
+import android.os.RemoteException;
import android.util.Log;
+import android.util.EventLog;
import android.webkit.URLUtil;
+import android.Manifest.permission;
import com.android.internal.R;
@@ -196,16 +202,26 @@
int numValidUris = 0;
for (Uri uri : mUris) {
try {
+ int uid = ActivityManagerNative.getDefault().getLaunchedFromUid(getActivityToken());
+ if (uri.getScheme().equalsIgnoreCase("file") &&
+ getApplicationContext().checkPermission(permission.READ_EXTERNAL_STORAGE, -1, uid) !=
+ PackageManager.PERMISSION_GRANTED) {
+ Log.e(TAG, "File based Uri doesn't have External Storage Permission.");
+ EventLog.writeEvent(0x534e4554, "37287958", uid, uri.getPath());
+ break;
+ }
grantUriPermission("com.android.nfc", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
uriArray[numValidUris++] = uri;
if (DBG) Log.d(TAG, "Found uri: " + uri);
} catch (SecurityException e) {
Log.e(TAG, "Security exception granting uri permission to NFC process.");
- numValidUris = 0;
+ break;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Remote exception accessing uid of the calling process.");
break;
}
}
- if (numValidUris > 0) {
+ if (numValidUris != 0 && numValidUris == mUris.size()) {
shareData = new BeamShareData(null, uriArray, myUserHandle, 0);
} else {
// No uris left
