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

Commit 0b4ab1f1 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

Add Task Root package info to UsageEvent 

Bug: 113094946
Test: manual (use "adb shell dumpsys usagestats apptimelimit" to verify
apps at the root of tasks are considered active)
Test: atest cts/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java#testTaskRootEventField
Test: atest cts/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java#testUsageSourceAttribution
Test: atest UsageStatsDatabaseTest

Change-Id: I40f86743d33c13892de0e59ae02c9ebddb606ee7
parent 9e10c879

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,8 @@ package android.app.usage { 
  public static final class UsageEvents.Event {

    method public int getInstanceId();

    method public String getNotificationChannelId();

    method @Nullable public String getTaskRootClassName();

    method @Nullable public String getTaskRootPackageName();

    field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc

    field public static final int NOTIFICATION_SEEN = 10; // 0xa

    field public static final int SLICE_PINNED = 14; // 0xe
@@ -1109,6 +1111,7 @@ package android.app.usage { 
  public final class UsageStatsManager {

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getAppStandbyBucket(String);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,java.lang.Integer> getAppStandbyBuckets();

    method public int getUsageSource();

    method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerAppUsageObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent, @Nullable android.app.PendingIntent);

    method public void reportUsageStart(@NonNull android.app.Activity, @NonNull String);
@@ -1124,6 +1127,8 @@ package android.app.usage { 
    field public static final String EXTRA_TIME_USED = "android.app.usage.extra.TIME_USED";

    field public static final int STANDBY_BUCKET_EXEMPTED = 5; // 0x5

    field public static final int STANDBY_BUCKET_NEVER = 50; // 0x32

    field public static final int USAGE_SOURCE_CURRENT_ACTIVITY = 2; // 0x2

    field public static final int USAGE_SOURCE_TASK_ROOT_ACTIVITY = 1; // 0x1

  }















}

































api/test-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -352,6 +352,10 @@ package android.app.usage {













    method public boolean isReservedSupported(@NonNull java.util.UUID);















  }





























  public final class UsageStatsManager {













    method public void forceUsageSourceSettingRead();













  }





























}































package android.bluetooth {

































core/java/android/app/ActivityManagerInternal.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -219,9 +219,11 @@ public abstract class ActivityManagerInternal {













     * @param userId















     * @param event















     * @param appToken ActivityRecord's appToken.













     * @param taskRoot TaskRecord's root















     */















    public abstract void updateActivityUsageStats(













            ComponentName activity, int userId, int event, IBinder appToken);













            ComponentName activity, int userId, int event, IBinder appToken,













            ComponentName taskRoot);















    public abstract void updateForegroundTimeIfOnBattery(















            String packageName, int uid, long cpuTimeDiff);















    public abstract void sendForegroundProfileChanged(int userId);

































core/java/android/app/usage/IUsageStatsManager.aidl



+2
−0




























Original line number
Diff line number
Diff line








@@ -59,4 +59,6 @@ interface IUsageStatsManager {













    void reportPastUsageStart(in IBinder activity, String token, long timeAgoMs,















            String callingPackage);















    void reportUsageStop(in IBinder activity, String token, String callingPackage);













    int getUsageSource();













    void forceUsageSourceSettingRead();















}
























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



+81
−1




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@













package android.app.usage;































import android.annotation.IntDef;













import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.annotation.UnsupportedAppUsage;















import android.content.res.Configuration;










@@ -286,12 +287,21 @@ public final class UsageEvents implements Parcelable {













        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)















        public String mClass;













































        /**















         * {@hide}















         */















        public int mInstanceId;





























        /**













         * {@hide}













         */













        public String mTaskRootPackage;



























        /**













         * {@hide}













         */













        public String mTaskRootClass;





























        /**















         * {@hide}















         */










@@ -373,6 +383,8 @@ public final class UsageEvents implements Parcelable {













            mPackage = orig.mPackage;















            mClass = orig.mClass;















            mInstanceId = orig.mInstanceId;













            mTaskRootPackage = orig.mTaskRootPackage;













            mTaskRootClass = orig.mTaskRootClass;















            mTimeStamp = orig.mTimeStamp;















            mEventType = orig.mEventType;















            mConfiguration = orig.mConfiguration;










@@ -410,6 +422,28 @@ public final class UsageEvents implements Parcelable {













            return mInstanceId;















        }





























        /**













         * The package name of the task root when this event was reported.













         * Or {@code null} for queries from apps without {@link













         * android.Manifest.permission#PACKAGE_USAGE_STATS}













         * @hide













         */













        @SystemApi













        public @Nullable String getTaskRootPackageName() {













            return mTaskRootPackage;













        }



























        /**













         * The class name of the task root when this event was reported.













         * Or {@code null} for queries from apps without {@link













         * android.Manifest.permission#PACKAGE_USAGE_STATS}













         * @hide













         */













        @SystemApi













        public @Nullable String getTaskRootClassName() {













            return mTaskRootClass;













        }





























        /**















         * The time at which this event occurred, measured in milliseconds since the epoch.















         * <p/>










@@ -522,6 +556,9 @@ public final class UsageEvents implements Parcelable {













    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)















    private int mIndex = 0;





























    // Only used when parceling events. If false, task roots will be omitted from the parcel













    private final boolean mIncludeTaskRoots;





























    /*















     * In order to save space, since ComponentNames will be duplicated everywhere,















     * we use a map and index into it.










@@ -552,6 +589,7 @@ public final class UsageEvents implements Parcelable {













            mParcel.setDataSize(mParcel.dataPosition());















            mParcel.setDataPosition(positionInParcel);















        }













        mIncludeTaskRoots = true;















    }































    /**









@@ -560,16 +598,27 @@ public final class UsageEvents implements Parcelable {













     */















    UsageEvents() {















        mEventCount = 0;













        mIncludeTaskRoots = true;















    }































    /**















     * Construct the iterator in preparation for writing it to a parcel.













     * Defaults to excluding task roots from the parcel.















     * {@hide}















     */















    public UsageEvents(List<Event> events, String[] stringPool) {













        this(events, stringPool, false);













    }



























    /**













     * Construct the iterator in preparation for writing it to a parcel.













     * {@hide}













     */













    public UsageEvents(List<Event> events, String[] stringPool, boolean includeTaskRoots) {















        mStringPool = stringPool;















        mEventCount = events.size();















        mEventsToWrite = events;













        mIncludeTaskRoots = includeTaskRoots;















    }































    /**










@@ -645,9 +694,25 @@ public final class UsageEvents implements Parcelable {













        } else {















            classIndex = -1;















        }



























        final int taskRootPackageIndex;













        if (mIncludeTaskRoots && event.mTaskRootPackage != null) {













            taskRootPackageIndex = findStringIndex(event.mTaskRootPackage);













        } else {













            taskRootPackageIndex = -1;













        }



























        final int taskRootClassIndex;













        if (mIncludeTaskRoots && event.mTaskRootClass != null) {













            taskRootClassIndex = findStringIndex(event.mTaskRootClass);













        } else {













            taskRootClassIndex = -1;













        }















        p.writeInt(packageIndex);















        p.writeInt(classIndex);















        p.writeInt(event.mInstanceId);













        p.writeInt(taskRootPackageIndex);













        p.writeInt(taskRootClassIndex);















        p.writeInt(event.mEventType);















        p.writeLong(event.mTimeStamp);


























@@ -691,6 +756,21 @@ public final class UsageEvents implements Parcelable {













            eventOut.mClass = null;















        }















        eventOut.mInstanceId = p.readInt();



























        final int taskRootPackageIndex = p.readInt();













        if (taskRootPackageIndex >= 0) {













            eventOut.mTaskRootPackage = mStringPool[taskRootPackageIndex];













        } else {













            eventOut.mTaskRootPackage = null;













        }



























        final int taskRootClassIndex = p.readInt();













        if (taskRootClassIndex >= 0) {













            eventOut.mTaskRootClass = mStringPool[taskRootClassIndex];













        } else {













            eventOut.mTaskRootClass = null;













        }





























        eventOut.mEventType = p.readInt();















        eventOut.mTimeStamp = p.readLong();