diff options
| author | Jeff Chang <chengjeff@google.com> | 2021-05-13 02:35:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-13 02:35:37 +0000 |
| commit | 5c62d1f9d637ed9d46631c06d0f380cfbfda157b (patch) | |
| tree | c72d8ed739983c275ca77e327b81a5d3c368751a /data | |
| parent | c73c098665515f33041d90f0a49b3cdc392e2b13 (diff) | |
| parent | ff2ee7296877469e77b87bb716d78916887c8e14 (diff) | |
Merge "Make no-history activity be finished with different tasks" into sc-dev
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/services.core.protolog.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 9b9511b15082..3c9086dde021 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -211,12 +211,6 @@ "group": "WM_DEBUG_WINDOW_ORGANIZER", "at": "com\/android\/server\/wm\/TaskOrganizerController.java" }, - "-1890326172": { - "message": "no-history finish of %s on new resume", - "level": "DEBUG", - "group": "WM_DEBUG_STATES", - "at": "com\/android\/server\/wm\/Task.java" - }, "-1884933373": { "message": "enableScreenAfterBoot: mDisplayEnabled=%b mForceDisplayEnabled=%b mShowingBootMessages=%b mSystemBooted=%b. %s", "level": "INFO", @@ -1429,6 +1423,12 @@ "group": "WM_ERROR", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, + "-484194149": { + "message": "no-history finish of %s on new resume", + "level": "DEBUG", + "group": "WM_DEBUG_STATES", + "at": "com\/android\/server\/wm\/ActivityTaskSupervisor.java" + }, "-481924678": { "message": "handleNotObscuredLocked w: %s, w.mHasSurface: %b, w.isOnScreen(): %b, w.isDisplayedLw(): %b, w.mAttrs.userActivityTimeout: %d", "level": "DEBUG", |