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

Merge "Replace Log.wtf by Log.e" into nyc-dev

Browse Source 
am: be2527b964

* commit 'be2527b964796aa490f94043deedc2ad7bcd222d':
  Replace Log.wtf by Log.e

Change-Id: I6ea32ab06cf2b0584f6d0574ea7d5106e28793ee
This commit is contained in:
Jorim Jaggi
2016-05-28 01:08:59 +00:00
committed by android-build-merger
parent 7317034daf be2527b964
commit cbd53dca91
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -18857,7 +18857,7 @@ public final class ActivityManagerService extends ActivityManagerNative
for (int j = 0; j < activitiesSize; j++) { for (int j = 0; j < activitiesSize; j++) {
final ActivityRecord r = app.activities.get(j); final ActivityRecord r = app.activities.get(j);
if (r.app != app) { if (r.app != app) {
Log.wtf(TAG, "Found activity " + r + " in proc activity list using " + r.app Log.e(TAG, "Found activity " + r + " in proc activity list using " + r.app
+ " instead of expected " + app); + " instead of expected " + app);
if (r.app == null || (r.app.uid == app.uid)) { if (r.app == null || (r.app.uid == app.uid)) {
// Only fix things up when they look sane // Only fix things up when they look sane