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

Merge "Log wallpaper crashes." into lmp-sprout-dev

Browse Source
This commit is contained in:
Filip Gruszczynski
2014-10-14 18:08:33 +00:00
committed by Android (Google) Code Review
parent 389e4ccd36 5dcc3aca42
commit 72f6e8ce81
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/EventLogTags.logtags
View File

@@ -164,6 +164,12 @@ option java_package com.android.server
32000 imf_force_reconnect_ime (IME|4),(Time Since Connect|2|3),(Showing|1|1) 32000 imf_force_reconnect_ime (IME|4),(Time Since Connect|2|3),(Showing|1|1)
# ---------------------------
# WallpaperManagerService.java
# ---------------------------
33000 wp_wallpaper_crashed (component|3)
# --------------------------- # ---------------------------
# ConnectivityService.java # ConnectivityService.java
# --------------------------- # ---------------------------

6
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -62,6 +62,7 @@ import android.service.wallpaper.IWallpaperConnection;
import android.service.wallpaper.IWallpaperEngine; import android.service.wallpaper.IWallpaperEngine;
import android.service.wallpaper.IWallpaperService; import android.service.wallpaper.IWallpaperService;
import android.service.wallpaper.WallpaperService; import android.service.wallpaper.WallpaperService;
import android.util.EventLog;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.Xml; import android.util.Xml;
@@ -87,6 +88,7 @@ import com.android.internal.content.PackageMonitor;
import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.JournaledFile; import com.android.internal.util.JournaledFile;
import com.android.internal.R; import com.android.internal.R;
import com.android.server.EventLogTags;
public class WallpaperManagerService extends IWallpaperManager.Stub { public class WallpaperManagerService extends IWallpaperManager.Stub {
static final String TAG = "WallpaperManagerService"; static final String TAG = "WallpaperManagerService";
@@ -99,6 +101,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
* restarting it vs. just reverting to the static wallpaper. * restarting it vs. just reverting to the static wallpaper.
*/ */
static final long MIN_WALLPAPER_CRASH_TIME = 10000; static final long MIN_WALLPAPER_CRASH_TIME = 10000;
static final int MAX_WALLPAPER_COMPONENT_LOG_LENGTH = 128;
static final String WALLPAPER = "wallpaper"; static final String WALLPAPER = "wallpaper";
static final String WALLPAPER_INFO = "wallpaper_info.xml"; static final String WALLPAPER_INFO = "wallpaper_info.xml";
@@ -272,6 +275,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
} else { } else {
mWallpaper.lastDiedTime = SystemClock.uptimeMillis(); mWallpaper.lastDiedTime = SystemClock.uptimeMillis();
} }
EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED,
name.flattenToString().substring(0,
MAX_WALLPAPER_COMPONENT_LOG_LENGTH));
} }
} }
} }