Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eb09c6a0: Merge change 7568 into donut

Browse Source 
Merge commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731'

* commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731':
  Issue #1969025: need api for launching intent as if it were coming from another component
This commit is contained in:
Android (Google) Code Review
2009-07-16 17:54:31 -07:00
committed by Android Git Automerger
parent 5b3f457845 eb09c6a07a
commit 019de98b84
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3528,8 +3528,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
intent = new Intent(intent);
// Collect information about the target of the Intent.
// Must do this before locking, because resolving the intent
// may require launching a process to run its content provider.
ActivityInfo aInfo;
try {
ResolveInfo rInfo =
@@ -3663,17 +3661,24 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
}
final int startActivityInPackage(int uid,
public final int startActivityInPackage(int uid,
Intent intent, String resolvedType, IBinder resultTo,
String resultWho, int requestCode, boolean onlyIfNeeded) {
// This is so super not safe, that only the system (or okay root)
// can do it.
final int callingUid = Binder.getCallingUid();
if (callingUid != 0 && callingUid != Process.myUid()) {
throw new SecurityException(
"startActivityInPackage only available to the system");
}
final boolean componentSpecified = intent.getComponent() != null;
// Don't modify the client's object!
intent = new Intent(intent);
// Collect information about the target of the Intent.
// Must do this before locking, because resolving the intent
// may require launching a process to run its content provider.
ActivityInfo aInfo;
try {
ResolveInfo rInfo =