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

Commit e497ad26 authored by Hui Yu's avatar Hui Yu
Browse files

Create a default package name for device level events. 

Device level event like DEVICE_SHUTDOWN does not have package name,
but some user code always expect a non-null packageName for every event.
Create a default packageName for these device level events.

Change-Id: Iee49794bdc6f5cb7b30d50f7421ac0de2a33c858
Fix: b/123429960
Test: NA.
parent 658db85c

core/java/android/app/usage/UsageEvents.java

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ public final class UsageEvents implements Parcelable { 
         */

        public static final int NONE = 0;



        /**

         * A device level event like {@link #DEVICE_SHUTDOWN} does not have package name, but some

         * user code always expect a non-null {@link #mPackage} for every event. Use

         * {@link #DEVICE_EVENT_PACKAGE_NAME} as packageName for these device level events.

         * @hide

         */

        public static final String DEVICE_EVENT_PACKAGE_NAME = "android";



        /**

         * @deprecated by {@link #ACTIVITY_RESUMED}

         */

services/usage/java/com/android/server/usage/UsageStatsService.java

+2 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ public class UsageStatsService extends SystemService implements 
        synchronized (mLock) {

            mHandler.removeMessages(MSG_REPORT_EVENT);

            Event event = new Event(DEVICE_SHUTDOWN, SystemClock.elapsedRealtime());

            event.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;

            // orderly shutdown, the last event is DEVICE_SHUTDOWN.

            reportEventToAllUserId(event);

            flushToDiskLocked();
@@ -449,6 +450,7 @@ public class UsageStatsService extends SystemService implements 
     */

    void prepareForPossibleShutdown() {

        Event event = new Event(DEVICE_SHUTDOWN, SystemClock.elapsedRealtime());

        event.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;

        mHandler.obtainMessage(MSG_REPORT_EVENT_TO_ALL_USERID, event).sendToTarget();

        mHandler.sendEmptyMessage(MSG_FLUSH_TO_DISK);

    }

services/usage/java/com/android/server/usage/UserUsageStatsService.java

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ class UserUsageStatsService { 
            if (size == 0 || currentDailyStats.events.get(size - 1).mEventType != DEVICE_SHUTDOWN) {

                // The last event in event list is not DEVICE_SHUTDOWN, then we insert one.

                final Event event = new Event(DEVICE_SHUTDOWN, currentDailyStats.lastTimeSaved);

                event.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;

                currentDailyStats.addEvent(event);

            }

        }