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

am 26627ccc: Merge "A little debug code from issue #6516197: Places app not getting removed..." into jb-dev

Browse Source 
* commit '26627ccc3f20ad353cf7c48c0488699c26e69a0b':
  A little debug code from issue #6516197: Places app not getting removed...
This commit is contained in:
Dianne Hackborn
2012-05-30 11:20:48 -07:00
committed by Android Git Automerger
parent 1b4341a682 26627ccc3f
commit defc301908
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/am/TaskRecord.java
View File

@@ -19,9 +19,8 @@ package com.android.server.am;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.os.UserId; import android.os.UserId;
import android.util.Slog;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -69,6 +68,8 @@ class TaskRecord extends ThumbnailHolder {
_intent.setSourceBounds(null); _intent.setSourceBounds(null);
} }
} }
if (ActivityManagerService.DEBUG_TASKS) Slog.v(ActivityManagerService.TAG,
"Setting Intent of " + this + " to " + _intent);
intent = _intent; intent = _intent;
realActivity = _intent != null ? _intent.getComponent() : null; realActivity = _intent != null ? _intent.getComponent() : null;
origActivity = null; origActivity = null;
@@ -80,6 +81,8 @@ class TaskRecord extends ThumbnailHolder {
targetIntent.setComponent(targetComponent); targetIntent.setComponent(targetComponent);
targetIntent.setSelector(null); targetIntent.setSelector(null);
targetIntent.setSourceBounds(null); targetIntent.setSourceBounds(null);
if (ActivityManagerService.DEBUG_TASKS) Slog.v(ActivityManagerService.TAG,
"Setting Intent of " + this + " to target " + targetIntent);
intent = targetIntent; intent = targetIntent;
realActivity = targetComponent; realActivity = targetComponent;
origActivity = _intent.getComponent(); origActivity = _intent.getComponent();
@@ -103,9 +106,10 @@ class TaskRecord extends ThumbnailHolder {
} }
void dump(PrintWriter pw, String prefix) { void dump(PrintWriter pw, String prefix) {
if (numActivities != 0 || rootWasReset) { if (numActivities != 0 || rootWasReset || userId != 0) {
pw.print(prefix); pw.print("numActivities="); pw.print(numActivities); pw.print(prefix); pw.print("numActivities="); pw.print(numActivities);
pw.print(" rootWasReset="); pw.println(rootWasReset); pw.print(" rootWasReset="); pw.print(rootWasReset);
pw.print(" userId="); pw.println(userId);
} }
if (affinity != null) { if (affinity != null) {
pw.print(prefix); pw.print("affinity="); pw.println(affinity); pw.print(prefix); pw.print("affinity="); pw.println(affinity);