diff options
| author | Jeff Hao <jeffhao@google.com> | 2014-08-20 10:35:34 -0700 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2014-08-26 15:54:25 -0700 |
| commit | 1b012d302b56b4adf950035136d1d191a1936d5a (patch) | |
| tree | 4b6fc0a3e89f7a2251680e7e13f7211a8dff7ba2 /core/java/android/app/Instrumentation.java | |
| parent | 987eb9734445bd92f6925b596b9b0ece90ad70b8 (diff) | |
| download | frameworks_base-1b012d302b56b4adf950035136d1d191a1936d5a.zip frameworks_base-1b012d302b56b4adf950035136d1d191a1936d5a.tar.gz frameworks_base-1b012d302b56b4adf950035136d1d191a1936d5a.tar.bz2 | |
Add sample profiling option to am.
Also bundles all profiling options into a class.
Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
Diffstat (limited to 'core/java/android/app/Instrumentation.java')
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index bc71bad..ba3a234 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1481,7 +1481,7 @@ public class Instrumentation { .startActivity(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, - requestCode, 0, null, null, options); + requestCode, 0, null, options); checkStartActivityResult(result, intent); } catch (RemoteException e) { } @@ -1598,7 +1598,7 @@ public class Instrumentation { .startActivity(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mWho : null, - requestCode, 0, null, null, options); + requestCode, 0, null, options); checkStartActivityResult(result, intent); } catch (RemoteException e) { } @@ -1658,7 +1658,7 @@ public class Instrumentation { .startActivityAsUser(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, - requestCode, 0, null, null, options, user.getIdentifier()); + requestCode, 0, null, options, user.getIdentifier()); checkStartActivityResult(result, intent); } catch (RemoteException e) { } @@ -1695,7 +1695,7 @@ public class Instrumentation { .startActivityAsCaller(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, - requestCode, 0, null, null, options); + requestCode, 0, null, options); checkStartActivityResult(result, intent); } catch (RemoteException e) { } |