diff --git a/services/java/com/android/server/AlarmManagerService.java b/services/java/com/android/server/AlarmManagerService.java
index b8c44d9..0574405 100644
--- a/services/java/com/android/server/AlarmManagerService.java
+++ b/services/java/com/android/server/AlarmManagerService.java
@@ -477,7 +477,8 @@
                         : bs.filterStats.entrySet()) {
                     pw.print("    "); pw.print(fe.getValue().count);
                             pw.print(" alarms: ");
-                            pw.println(fe.getKey().getIntent().toShortString(false, true, false));
+                            pw.println(fe.getKey().getIntent().toShortString(
+                                    false, true, false, true));
                 }
             }
         }
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 4ea2f04..ce597ad 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -49,10 +49,10 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.app.WallpaperManager;
 import android.app.backup.IBackupManager;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
+import android.content.ClipData;
 import android.content.ComponentCallbacks2;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -4657,9 +4657,11 @@
      * if callingUid is not allowed to do this.  Returns the uid of the target
      * if the URI permission grant should be performed; returns -1 if it is not
      * needed (for example targetPkg already has permission to access the URI).
+     * If you already know the uid of the target, you can supply it in
+     * lastTargetUid else set that to -1.
      */
     int checkGrantUriPermissionLocked(int callingUid, String targetPkg,
-            Uri uri, int modeFlags) {
+            Uri uri, int modeFlags, int lastTargetUid) {
         modeFlags &= (Intent.FLAG_GRANT_READ_URI_PERMISSION
                 | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
         if (modeFlags == 0) {
@@ -4698,8 +4700,8 @@
             return -1;
         }
 
-        int targetUid;
-        if (targetPkg != null) {
+        int targetUid = lastTargetUid;
+        if (targetUid < 0 && targetPkg != null) {
             try {
                 targetUid = pm.getPackageUid(targetPkg);
                 if (targetUid < 0) {
@@ -4710,8 +4712,6 @@
             } catch (RemoteException ex) {
                 return -1;
             }
-        } else {
-            targetUid = -1;
         }
 
         if (targetUid >= 0) {
@@ -4783,7 +4783,7 @@
             Uri uri, int modeFlags) {
         enforceNotIsolatedCaller("checkGrantUriPermission");
         synchronized(this) {
-            return checkGrantUriPermissionLocked(callingUid, targetPkg, uri, modeFlags);
+            return checkGrantUriPermissionLocked(callingUid, targetPkg, uri, modeFlags, -1);
         }
     }
 
@@ -4830,13 +4830,13 @@
         }
     }
 
-    void grantUriPermissionLocked(int callingUid,
-            String targetPkg, Uri uri, int modeFlags, UriPermissionOwner owner) {
+    void grantUriPermissionLocked(int callingUid, String targetPkg, Uri uri,
+            int modeFlags, UriPermissionOwner owner) {
         if (targetPkg == null) {
             throw new NullPointerException("targetPkg");
         }
 
-        int targetUid = checkGrantUriPermissionLocked(callingUid, targetPkg, uri, modeFlags);
+        int targetUid = checkGrantUriPermissionLocked(callingUid, targetPkg, uri, modeFlags, -1);
         if (targetUid < 0) {
             return;
         }
@@ -4844,13 +4844,26 @@
         grantUriPermissionUncheckedLocked(targetUid, targetPkg, uri, modeFlags, owner);
     }
 
+    static class NeededUriGrants extends ArrayList<Uri> {
+        final String targetPkg;
+        final int targetUid;
+        final int flags;
+
+        NeededUriGrants(String _targetPkg, int _targetUid, int _flags) {
+            targetPkg = _targetPkg;
+            targetUid = _targetUid;
+            flags = _flags;
+        }
+    }
+
     /**
      * Like checkGrantUriPermissionLocked, but takes an Intent.
      */
-    int checkGrantUriPermissionFromIntentLocked(int callingUid,
-            String targetPkg, Intent intent) {
+    NeededUriGrants checkGrantUriPermissionFromIntentLocked(int callingUid,
+            String targetPkg, Intent intent, int mode, NeededUriGrants needed) {
         if (DEBUG_URI_PERMISSION) Slog.v(TAG,
-                "Checking URI perm to " + (intent != null ? intent.getData() : null)
+                "Checking URI perm to data=" + (intent != null ? intent.getData() : null)
+                + " clip=" + (intent != null ? intent.getClipData() : null)
                 + " from " + intent + "; flags=0x"
                 + Integer.toHexString(intent != null ? intent.getFlags() : 0));
 
@@ -4859,33 +4872,74 @@
         }
 
         if (intent == null) {
-            return -1;
+            return null;
         }
         Uri data = intent.getData();
-        if (data == null) {
-            return -1;
+        ClipData clip = intent.getClipData();
+        if (data == null && clip == null) {
+            return null;
         }
-        return checkGrantUriPermissionLocked(callingUid, targetPkg, data,
-                intent.getFlags());
+        if (data != null) {
+            int target = checkGrantUriPermissionLocked(callingUid, targetPkg, data,
+                mode, needed != null ? needed.targetUid : -1);
+            if (target > 0) {
+                if (needed == null) {
+                    needed = new NeededUriGrants(targetPkg, target, mode);
+                }
+                needed.add(data);
+            }
+        }
+        if (clip != null) {
+            for (int i=0; i<clip.getItemCount(); i++) {
+                Uri uri = clip.getItemAt(i).getUri();
+                if (uri != null) {
+                    int target = -1;
+                    target = checkGrantUriPermissionLocked(callingUid, targetPkg, uri,
+                            mode, needed != null ? needed.targetUid : -1);
+                    if (target > 0) {
+                        if (needed == null) {
+                            needed = new NeededUriGrants(targetPkg, target, mode);
+                        }
+                        needed.add(uri);
+                    }
+                } else {
+                    Intent clipIntent = clip.getItemAt(i).getIntent();
+                    if (clipIntent != null) {
+                        NeededUriGrants newNeeded = checkGrantUriPermissionFromIntentLocked(
+                                callingUid, targetPkg, clipIntent, mode, needed);
+                        if (newNeeded != null) {
+                            needed = newNeeded;
+                        }
+                    }
+                }
+            }
+        }
+
+        return needed;
     }
 
     /**
      * Like grantUriPermissionUncheckedLocked, but takes an Intent.
      */
-    void grantUriPermissionUncheckedFromIntentLocked(int targetUid,
-            String targetPkg, Intent intent, UriPermissionOwner owner) {
-        grantUriPermissionUncheckedLocked(targetUid, targetPkg, intent.getData(),
-                intent.getFlags(), owner);
+    void grantUriPermissionUncheckedFromIntentLocked(NeededUriGrants needed,
+            UriPermissionOwner owner) {
+        if (needed != null) {
+            for (int i=0; i<needed.size(); i++) {
+                grantUriPermissionUncheckedLocked(needed.targetUid, needed.targetPkg,
+                        needed.get(i), needed.flags, owner);
+            }
+        }
     }
 
     void grantUriPermissionFromIntentLocked(int callingUid,
             String targetPkg, Intent intent, UriPermissionOwner owner) {
-        int targetUid = checkGrantUriPermissionFromIntentLocked(callingUid, targetPkg, intent);
-        if (targetUid < 0) {
+        NeededUriGrants needed = checkGrantUriPermissionFromIntentLocked(callingUid, targetPkg,
+                intent, intent.getFlags(), null);
+        if (needed == null) {
             return;
         }
 
-        grantUriPermissionUncheckedFromIntentLocked(targetUid, targetPkg, intent, owner);
+        grantUriPermissionUncheckedFromIntentLocked(needed, owner);
     }
 
     public void grantUriPermission(IApplicationThread caller, String targetPkg,
@@ -5406,7 +5460,7 @@
                     stopServiceLocked(sr);
                 } else {
                     sr.pendingStarts.add(new ServiceRecord.StartItem(sr, true,
-                            sr.makeNextStartId(), baseIntent, -1));
+                            sr.makeNextStartId(), baseIntent, null));
                     if (sr.app != null && sr.app.thread != null) {
                         sendServiceArgsLocked(sr, false);
                     }
@@ -9044,7 +9098,7 @@
                     for (int i=0; i<N; i++) {
                         sb.setLength(0);
                         sb.append("    Intent: ");
-                        intents.get(i).toShortString(sb, false, true, false);
+                        intents.get(i).toShortString(sb, false, true, false, false);
                         pw.println(sb.toString());
                         Bundle bundle = intents.get(i).getExtras();
                         if (bundle != null) {
@@ -9129,7 +9183,7 @@
                                         ConnectionRecord conn = clist.get(i);
                                         pw.print("      ");
                                         pw.print(conn.binding.intent.intent.getIntent()
-                                                .toShortString(false, false, false));
+                                                .toShortString(false, false, false, false));
                                         pw.print(" -> ");
                                         ProcessRecord proc = conn.binding.client;
                                         pw.println(proc != null ? proc.toShortString() : "null");
@@ -9380,7 +9434,7 @@
                     // Complete + brief == give a summary.  Isn't that obvious?!?
                     if (lastTask.intent != null) {
                         pw.print(prefix); pw.print("  ");
-                                pw.println(lastTask.intent.toInsecureString());
+                                pw.println(lastTask.intent.toInsecureStringWithClip());
                     }
                 }
             }
@@ -10692,9 +10746,9 @@
                 si.deliveredTime = SystemClock.uptimeMillis();
                 r.deliveredStarts.add(si);
                 si.deliveryCount++;
-                if (si.targetPermissionUid >= 0 && si.intent != null) {
-                    grantUriPermissionUncheckedFromIntentLocked(si.targetPermissionUid,
-                            r.packageName, si.intent, si.getUriPermissionsLocked());
+                if (si.neededGrants != null) {
+                    grantUriPermissionUncheckedFromIntentLocked(si.neededGrants,
+                            si.getUriPermissionsLocked());
                 }
                 bumpServiceExecutingLocked(r, "start");
                 if (!oomAdjusted) {
@@ -10772,7 +10826,7 @@
         boolean created = false;
         try {
             mStringBuilder.setLength(0);
-            r.intent.getIntent().toShortString(mStringBuilder, true, false, true);
+            r.intent.getIntent().toShortString(mStringBuilder, true, false, true, false);
             EventLog.writeEvent(EventLogTags.AM_CREATE_SERVICE,
                     System.identityHashCode(r), r.shortName,
                     mStringBuilder.toString(), r.app.pid);
@@ -10798,7 +10852,7 @@
         // be called.
         if (r.startRequested && r.callStart && r.pendingStarts.size() == 0) {
             r.pendingStarts.add(new ServiceRecord.StartItem(r, false, r.makeNextStartId(),
-                    null, -1));
+                    null, null));
         }
         
         sendServiceArgsLocked(r, true);
@@ -11170,15 +11224,15 @@
                         ? res.permission : "private to package");
             }
             ServiceRecord r = res.record;
-            int targetPermissionUid = checkGrantUriPermissionFromIntentLocked(
-                    callingUid, r.packageName, service);
+            NeededUriGrants neededGrants = checkGrantUriPermissionFromIntentLocked(
+                    callingUid, r.packageName, service, service.getFlags(), null);
             if (unscheduleServiceRestartLocked(r)) {
                 if (DEBUG_SERVICE) Slog.v(TAG, "START SERVICE WHILE RESTART PENDING: " + r);
             }
             r.startRequested = true;
             r.callStart = false;
             r.pendingStarts.add(new ServiceRecord.StartItem(r, false, r.makeNextStartId(),
-                    service, targetPermissionUid));
+                    service, neededGrants));
             r.lastActivity = SystemClock.uptimeMillis();
             synchronized (r.stats.getBatteryStats()) {
                 r.stats.startRunningLocked();
diff --git a/services/java/com/android/server/am/ActivityRecord.java b/services/java/com/android/server/am/ActivityRecord.java
index cdab6c6..a337b40 100644
--- a/services/java/com/android/server/am/ActivityRecord.java
+++ b/services/java/com/android/server/am/ActivityRecord.java
@@ -127,26 +127,27 @@
         pw.print(prefix); pw.print("packageName="); pw.print(packageName);
                 pw.print(" processName="); pw.println(processName);
         pw.print(prefix); pw.print("launchedFromUid="); pw.print(launchedFromUid);
-        pw.print(prefix); pw.print("userId="); pw.print(userId);
-                pw.print(" app="); pw.println(app);
-        pw.print(prefix); pw.println(intent.toInsecureString());
+                pw.print(" userId="); pw.println(userId);
+        pw.print(prefix); pw.print("app="); pw.println(app);
+        pw.print(prefix); pw.println(intent.toInsecureStringWithClip());
         pw.print(prefix); pw.print("frontOfTask="); pw.print(frontOfTask);
                 pw.print(" task="); pw.println(task);
         pw.print(prefix); pw.print("taskAffinity="); pw.println(taskAffinity);
         pw.print(prefix); pw.print("realActivity=");
                 pw.println(realActivity.flattenToShortString());
-        pw.print(prefix); pw.print("base="); pw.print(baseDir);
-                if (!resDir.equals(baseDir)) pw.print(" res="); pw.print(resDir);
-                pw.print(" data="); pw.println(dataDir);
-        pw.print(prefix); pw.print("labelRes=0x");
-                pw.print(Integer.toHexString(labelRes));
-                pw.print(" icon=0x"); pw.print(Integer.toHexString(icon));
-                pw.print(" theme=0x"); pw.println(Integer.toHexString(theme));
+        pw.print(prefix); pw.print("baseDir="); pw.println(baseDir);
+        if (!resDir.equals(baseDir)) {
+            pw.print(prefix); pw.print("resDir="); pw.println(resDir);
+        }
+        pw.print(prefix); pw.print("dataDir="); pw.println(dataDir);
         pw.print(prefix); pw.print("stateNotNeeded="); pw.print(stateNotNeeded);
                 pw.print(" componentSpecified="); pw.print(componentSpecified);
                 pw.print(" isHomeActivity="); pw.println(isHomeActivity);
+        pw.print(prefix); pw.print("compat="); pw.print(compat);
+                pw.print(" labelRes=0x"); pw.print(Integer.toHexString(labelRes));
+                pw.print(" icon=0x"); pw.print(Integer.toHexString(icon));
+                pw.print(" theme=0x"); pw.println(Integer.toHexString(theme));
         pw.print(prefix); pw.print("config="); pw.println(configuration);
-        pw.print(prefix); pw.print("compat="); pw.println(compat);
         if (resultTo != null || resultWho != null) {
             pw.print(prefix); pw.print("resultTo="); pw.print(resultTo);
                     pw.print(" resultWho="); pw.print(resultWho);
@@ -193,13 +194,11 @@
                     TimeUtils.formatDuration(launchTime, pw); pw.print(" startTime=");
                     TimeUtils.formatDuration(startTime, pw); pw.println("");
         }
-        if (lastVisibleTime != 0) {
-            pw.print(prefix); pw.print("lastVisibleTime=");
-                    TimeUtils.formatDuration(lastVisibleTime, pw); pw.println("");
-        }
-        if (waitingVisible || nowVisible) {
+        if (lastVisibleTime != 0 || waitingVisible || nowVisible) {
             pw.print(prefix); pw.print("waitingVisible="); pw.print(waitingVisible);
-                    pw.print(" nowVisible="); pw.println(nowVisible);
+                    pw.print(" nowVisible="); pw.print(nowVisible);
+                    pw.print("lastVisibleTime=");
+                    TimeUtils.formatDuration(lastVisibleTime, pw); pw.println("");
         }
         if (configDestroy || configChangeFlags != 0) {
             pw.print(prefix); pw.print("configDestroy="); pw.print(configDestroy);
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index f9641eb..19fe1bf 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2290,8 +2290,8 @@
         }
 
         if (err == START_SUCCESS) {
-            Slog.i(TAG, "START {" + intent.toShortString(true, true, true) + "} from pid "
-                    + (callerApp != null ? callerApp.pid : callingPid));
+            Slog.i(TAG, "START {" + intent.toShortString(true, true, true, false)
+                    + "} from pid " + (callerApp != null ? callerApp.pid : callingPid));
         }
 
         ActivityRecord sourceRecord = null;
diff --git a/services/java/com/android/server/am/IntentBindRecord.java b/services/java/com/android/server/am/IntentBindRecord.java
index 2618c77..c94f714 100644
--- a/services/java/com/android/server/am/IntentBindRecord.java
+++ b/services/java/com/android/server/am/IntentBindRecord.java
@@ -54,7 +54,7 @@
 
     void dumpInService(PrintWriter pw, String prefix) {
         pw.print(prefix); pw.print("intent={");
-                pw.print(intent.getIntent().toShortString(false, true, false));
+                pw.print(intent.getIntent().toShortString(false, true, false, false));
                 pw.println('}');
         pw.print(prefix); pw.print("binder="); pw.println(binder);
         pw.print(prefix); pw.print("requested="); pw.print(requested);
@@ -89,7 +89,7 @@
         sb.append(service.shortName);
         sb.append(':');
         if (intent != null) {
-            intent.getIntent().toShortString(sb, false, false, false);
+            intent.getIntent().toShortString(sb, false, false, false, false);
         }
         sb.append('}');
         return stringName = sb.toString();
diff --git a/services/java/com/android/server/am/PendingIntentRecord.java b/services/java/com/android/server/am/PendingIntentRecord.java
index 3b6a97c..0043874 100644
--- a/services/java/com/android/server/am/PendingIntentRecord.java
+++ b/services/java/com/android/server/am/PendingIntentRecord.java
@@ -152,7 +152,7 @@
             return "Key{" + typeName() + " pkg=" + packageName
                 + " intent="
                 + (requestIntent != null
-                        ? requestIntent.toShortString(false, true, false) : "<null>")
+                        ? requestIntent.toShortString(false, true, false, false) : "<null>")
                 + " flags=0x" + Integer.toHexString(flags) + "}";
         }
         
@@ -320,7 +320,7 @@
         }
         if (key.requestIntent != null) {
             pw.print(prefix); pw.print("requestIntent=");
-                    pw.println(key.requestIntent.toShortString(false, true, true));
+                    pw.println(key.requestIntent.toShortString(false, true, true, true));
         }
         if (sent || canceled) {
             pw.print(prefix); pw.print("sent="); pw.print(sent);
diff --git a/services/java/com/android/server/am/ServiceRecord.java b/services/java/com/android/server/am/ServiceRecord.java
index daa3653..828eef7 100644
--- a/services/java/com/android/server/am/ServiceRecord.java
+++ b/services/java/com/android/server/am/ServiceRecord.java
@@ -106,7 +106,7 @@
         final boolean taskRemoved;
         final int id;
         final Intent intent;
-        final int targetPermissionUid;
+        final ActivityManagerService.NeededUriGrants neededGrants;
         long deliveredTime;
         int deliveryCount;
         int doneExecutingCount;
@@ -115,12 +115,12 @@
         String stringName;      // caching of toString
 
         StartItem(ServiceRecord _sr, boolean _taskRemoved, int _id, Intent _intent,
-                int _targetPermissionUid) {
+                ActivityManagerService.NeededUriGrants _neededGrants) {
             sr = _sr;
             taskRemoved = _taskRemoved;
             id = _id;
             intent = _intent;
-            targetPermissionUid = _targetPermissionUid;
+            neededGrants = _neededGrants;
         }
 
         UriPermissionOwner getUriPermissionsLocked() {
@@ -177,9 +177,9 @@
             pw.print(prefix); pw.print("  intent=");
                     if (si.intent != null) pw.println(si.intent.toString());
                     else pw.println("null");
-            if (si.targetPermissionUid >= 0) {
-                pw.print(prefix); pw.print("  targetPermissionUid=");
-                        pw.println(si.targetPermissionUid);
+            if (si.neededGrants != null) {
+                pw.print(prefix); pw.print("  neededGrants=");
+                        pw.println(si.neededGrants);
             }
             if (si.uriPermissions != null) {
                 if (si.uriPermissions.readUriPermissions != null) {
@@ -196,7 +196,7 @@
     
     void dump(PrintWriter pw, String prefix) {
         pw.print(prefix); pw.print("intent={");
-                pw.print(intent.getIntent().toShortString(false, true, false));
+                pw.print(intent.getIntent().toShortString(false, true, false, true));
                 pw.println('}');
         pw.print(prefix); pw.print("packageName="); pw.println(packageName);
         pw.print(prefix); pw.print("processName="); pw.println(processName);
diff --git a/services/java/com/android/server/am/TaskRecord.java b/services/java/com/android/server/am/TaskRecord.java
index 47ec218..67873cc 100644
--- a/services/java/com/android/server/am/TaskRecord.java
+++ b/services/java/com/android/server/am/TaskRecord.java
@@ -111,14 +111,14 @@
         if (intent != null) {
             StringBuilder sb = new StringBuilder(128);
             sb.append(prefix); sb.append("intent={");
-            intent.toShortString(sb, false, true, false);
+            intent.toShortString(sb, false, true, false, true);
             sb.append('}');
             pw.println(sb.toString());
         }
         if (affinityIntent != null) {
             StringBuilder sb = new StringBuilder(128);
             sb.append(prefix); sb.append("affinityIntent={");
-            affinityIntent.toShortString(sb, false, true, false);
+            affinityIntent.toShortString(sb, false, true, false, true);
             sb.append('}');
             pw.println(sb.toString());
         }