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

Commit 8f2dee04 authored by jianjin's avatar jianjin
Browse files

Create and log atom SystemServerWatchdogOccurred, TombStoneOccurred. 

Bug: 126127632
Change-Id: I1e78069589185a4702d65cd026bc44b374a31f0a
Fix: 126127632
Test: none
parent d5c80f29

cmds/statsd/src/atoms.proto

+19 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,8 @@ message Atom { 
        NetworkStackReported network_stack_reported = 182;

        NetworkStackReported network_stack_reported = 182;

        AppMovedStorageReported app_moved_storage_reported = 183;

        AppMovedStorageReported app_moved_storage_reported = 183;

        BiometricEnrolled biometric_enrolled = 184;

        BiometricEnrolled biometric_enrolled = 184;

        SystemServerWatchdogOccurred system_server_watchdog_occurred = 185;

        TombStoneOccurred tomb_stone_occurred = 186;

    }

    }





    // Pulled events will start at field 10000.

    // Pulled events will start at field 10000.
@@ -3493,6 +3495,23 @@ message AppMovedStorageReported { 
    optional string package_name = 3;

    optional string package_name = 3;

}

}





/**

 * Logs when system server watchdog occurs.

 * Logged from:

 *      frameworks/base/services/core/java/com/android/server/Watchdog.java

 */

message SystemServerWatchdogOccurred {

    optional string subject = 1;

}



/**

 * Logs when new file added to tombstones.

 * Logged from:

 *      frameworks/base/core/java/com/android/server/BootReceiver.java

 */

message TombStoneOccurred {

}



//////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////

// Pulled atoms below this line //

// Pulled atoms below this line //

//////////////////////////////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////

core/java/com/android/server/BootReceiver.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -267,6 +267,7 @@ public class BootReceiver extends BroadcastReceiver { 
                    if (file.isFile() && file.getName().startsWith("tombstone_")) {

                    if (file.isFile() && file.getName().startsWith("tombstone_")) {

                        addFileToDropBox(db, timestamps, headers, file.getPath(), LOG_SIZE,

                        addFileToDropBox(db, timestamps, headers, file.getPath(), LOG_SIZE,

                                TAG_TOMBSTONE);

                                TAG_TOMBSTONE);

                        StatsLog.write(StatsLog.TOMB_STONE_OCCURRED);

                    }

                    }

                } catch (IOException e) {

                } catch (IOException e) {

                    Slog.e(TAG, "Can't log tombstone", e);

                    Slog.e(TAG, "Can't log tombstone", e);

services/core/java/com/android/server/Watchdog.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ import android.system.StructRlimit; 
import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.StatsLog;





import com.android.internal.os.ZygoteConnectionConstants;

import com.android.internal.os.ZygoteConnectionConstants;

import com.android.server.am.ActivityManagerService;

import com.android.server.am.ActivityManagerService;
@@ -539,6 +540,7 @@ public class Watchdog extends Thread { 
                        mActivity.addErrorToDropBox(

                        mActivity.addErrorToDropBox(

                                "watchdog", null, "system_server", null, null, null,

                                "watchdog", null, "system_server", null, null, null,

                                subject, null, stack, null);

                                subject, null, stack, null);

                        StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject);

                    }

                    }

                };

                };

            dropboxThread.start();

            dropboxThread.start();