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

Commit 7b9e055a authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "[Quality] Use the new filter based app usage events API introduced in V" into main

parents aea44900 1ddbc760

src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java

+11 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.settingslib.fuelgauge.BatteryStatus.BATTERY_LEVEL_UNKN 
import android.app.usage.IUsageStatsManager;

import android.app.usage.UsageEvents;

import android.app.usage.UsageEvents.Event;

import android.app.usage.UsageEventsQuery;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;
@@ -1047,9 +1048,16 @@ public final class DataProcessor { 
        final long start = System.currentTimeMillis();

        UsageEvents events = null;

        try {

            events =

                    usageStatsManager.queryEventsForUser(

                            startTime, endTime, userId, callingPackage);

            final UsageEventsQuery usageEventsQuery =

                    new UsageEventsQuery.Builder(startTime, endTime)

                            .setUserId(userId)

                            .setEventTypes(

                                    Event.ACTIVITY_RESUMED,

                                    Event.ACTIVITY_STOPPED,

                                    Event.DEVICE_SHUTDOWN

                            )

                            .build();

            events = usageStatsManager.queryEventsWithFilter(usageEventsQuery, callingPackage);

        } catch (RemoteException e) {

            Log.e(TAG, "Error fetching usage events: ", e);

        }

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;
@@ -192,7 +192,7 @@ public final class DataProcessManagerTest { 
        events.add(event2);

        doReturn(getUsageEvents(events))

                .when(mUsageStatsManager)

                .queryEventsForUser(anyLong(), anyLong(), anyInt(), any());

                .queryEventsWithFilter(any(), anyString());

        doReturn(true).when(mUserManager).isUserUnlocked(anyInt());

        // Assign current user id.

        doReturn(1).when(mContext).getUserId();
@@ -322,7 +322,7 @@ public final class DataProcessManagerTest { 
        events.add(event);

        doReturn(getUsageEvents(events))

                .when(mUsageStatsManager)

                .queryEventsForUser(anyLong(), anyLong(), anyInt(), any());

                .queryEventsWithFilter(any(), anyString());

        doReturn(true).when(mUserIdsSeries).isCurrentUserLocked();

        final MatrixCursor cursor =

                new MatrixCursor(

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java

+5 −5
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import static com.android.settingslib.fuelgauge.BatteryStatus.BATTERY_LEVEL_UNKN 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyLong;

import static org.mockito.Mockito.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;
@@ -119,7 +119,7 @@ public final class DataProcessorTest { 
        doReturn(true).when(mUserManager).isUserUnlocked(userInfo.id);

        doReturn(mUsageEvents1)

                .when(mUsageStatsManager)

                .queryEventsForUser(anyLong(), anyLong(), anyInt(), anyString());

                .queryEventsWithFilter(any(), anyString());

        doReturn(new ArrayList<>(List.of(0))).when(mUserIdsSeries).getVisibleUserIds();



        final Map<Long, UsageEvents> resultMap =
@@ -153,7 +153,7 @@ public final class DataProcessorTest { 
        doReturn(true).when(mUserManager).isUserUnlocked(userInfo.id);

        doReturn(null)

                .when(mUsageStatsManager)

                .queryEventsForUser(anyLong(), anyLong(), anyInt(), anyString());

                .queryEventsWithFilter(any(), anyString());



        final Map<Long, UsageEvents> resultMap =

                DataProcessor.getAppUsageEvents(mContext, mUserIdsSeries);
@@ -167,7 +167,7 @@ public final class DataProcessorTest { 
        doReturn(true).when(mUserManager).isUserUnlocked(userId);

        doReturn(mUsageEvents1)

                .when(mUsageStatsManager)

                .queryEventsForUser(anyLong(), anyLong(), anyInt(), anyString());

                .queryEventsWithFilter(any(), anyString());



        assertThat(DataProcessor.getCurrentAppUsageEventsForUser(

                mContext, mUserIdsSeries, userId, 0))
@@ -191,7 +191,7 @@ public final class DataProcessorTest { 
        doReturn(true).when(mUserManager).isUserUnlocked(userId);

        doReturn(null)

                .when(mUsageStatsManager)

                .queryEventsForUser(anyLong(), anyLong(), anyInt(), anyString());

                .queryEventsWithFilter(any(), anyString());



        assertThat(DataProcessor.getCurrentAppUsageEventsForUser(

                mContext, mUserIdsSeries, userId, 0))