Merge cherrypicks of [2604297, 2604299, 2604519, 2606195, 2605695, 2604520, 2606196, 2604521, 2604522, 2606197, 2604523, 2605696, 2605697, 2605698, 2606198, 2604524, 2604525, 2604526, 2604300, 2604527, 2606199, 2604528, 2604529, 2604301, 2606200, 2604302, 2606410, 2606201, 2606411, 2606202, 2606413, 2606203, 2606414, 2604303, 2604304, 2606204, 2604305, 2606206, 2606207, 2604306, 2606415, 2606208, 2606209, 2606416] into nyc-mr1-volantis-release
Change-Id: Ic91c99c006b8c994a993a0e5bcfc18ba122e3099
diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java
index 5b8acac..f06bfdb 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;
@@ -211,16 +217,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
