Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31278350 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 

* commit '72f6e8ce':
  Log wallpaper crashes.
parents b42cd383 72f6e8ce

services/core/java/com/android/server/EventLogTags.logtags

+6 −0
Original line number Diff line number Diff line
@@ -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)





# ---------------------------

# WallpaperManagerService.java

# ---------------------------

33000 wp_wallpaper_crashed (component|3)





# ---------------------------

# ConnectivityService.java

# ---------------------------

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.service.wallpaper.IWallpaperConnection; 
import android.service.wallpaper.IWallpaperEngine;

import android.service.wallpaper.IWallpaperService;

import android.service.wallpaper.WallpaperService;

import android.util.EventLog;

import android.util.Slog;

import android.util.SparseArray;

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.JournaledFile;

import com.android.internal.R;

import com.android.server.EventLogTags;



public class WallpaperManagerService extends IWallpaperManager.Stub {

    static final String TAG = "WallpaperManagerService";
@@ -99,6 +101,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
     * restarting it vs. just reverting to the static wallpaper.

     */

    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_INFO = "wallpaper_info.xml";
@@ -272,6 +275,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
                        } else {

                            mWallpaper.lastDiedTime = SystemClock.uptimeMillis();

                        }

                        EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED,

                                name.flattenToString().substring(0,

                                        MAX_WALLPAPER_COMPONENT_LOG_LENGTH));

                    }

                }

            }