summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android/keyguard
diff options
context:
space:
mode:
authorJeff Hao <jeffhao@google.com>2014-08-20 10:35:34 -0700
committerJeff Hao <jeffhao@google.com>2014-08-26 15:54:25 -0700
commit1b012d302b56b4adf950035136d1d191a1936d5a (patch)
tree4b6fc0a3e89f7a2251680e7e13f7211a8dff7ba2 /packages/Keyguard/src/com/android/keyguard
parent987eb9734445bd92f6925b596b9b0ece90ad70b8 (diff)
downloadframeworks_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 'packages/Keyguard/src/com/android/keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java b/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
index 32f7a1e..1978ded 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
@@ -242,8 +242,7 @@ public abstract class KeyguardActivityLauncher {
null /*resultWho*/,
0 /*requestCode*/,
Intent.FLAG_ACTIVITY_NEW_TASK,
- null /*profileFile*/,
- null /*profileFd*/,
+ null /*profilerInfo*/,
options,
user.getIdentifier());
if (DEBUG) Log.d(TAG, String.format("waitResult[%s,%s,%s,%s] at %s",