summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am/ActivityStack.java
diff options
context:
space:
mode:
Diffstat (limited to 'services/java/com/android/server/am/ActivityStack.java')
-rwxr-xr-xservices/java/com/android/server/am/ActivityStack.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 4546dc3..2fd3c0c 100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -54,12 +54,14 @@ import android.os.ParcelFileDescriptor;
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.SystemClock;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.EventLog;
import android.util.Log;
import android.util.Slog;
import android.view.Display;
import android.view.WindowManagerPolicy;
+import com.android.internal.app.ActivityTrigger;
import java.io.IOException;
import java.lang.ref.WeakReference;
@@ -306,6 +308,16 @@ final class ActivityStack {
}
}
+ private static final ActivityTrigger mActivityTrigger;
+
+ static {
+ if (SystemProperties.QCOM_HARDWARE) {
+ mActivityTrigger = new ActivityTrigger();
+ } else {
+ mActivityTrigger = null;
+ }
+ }
+
final Handler mHandler = new Handler() {
//public Handler() {
// if (localLOGV) Slog.v(TAG, "Handler started!");
@@ -1468,6 +1480,10 @@ final class ActivityStack {
if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next);
+ if (mActivityTrigger != null) {
+ mActivityTrigger.activityResumeTrigger(next.intent);
+ }
+
// If we are currently pausing an activity, then don't do anything
// until that is done.
if (mPausingActivity != null) {
@@ -2478,6 +2494,9 @@ final class ActivityStack {
final int userId = aInfo != null ? UserHandle.getUserId(aInfo.applicationInfo.uid) : 0;
Slog.i(TAG, "START u" + userId + " {" + intent.toShortString(true, true, true, false)
+ "} from pid " + (callerApp != null ? callerApp.pid : callingPid));
+ if (mActivityTrigger != null) {
+ mActivityTrigger.activityStartTrigger(intent);
+ }
}
ActivityRecord sourceRecord = null;