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

Commit b1d32ee7 authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge "Persist Locus Id Event to UsageStatsProto." into rvc-dev

parents e9bd677f 7ce78c23

core/proto/android/server/usagestatsservice.proto

+2 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,8 @@ message IntervalStatsProto { 
    optional int32 task_root_package_index = 15;

    optional int32 task_root_package_index = 15;

    // task_root_class_index contains the index + 1 of the task root class name in the string pool

    // task_root_class_index contains the index + 1 of the task root class name in the string pool

    optional int32 task_root_class_index = 16;

    optional int32 task_root_class_index = 16;

    // locus_id_index contains the index + 1 of the locus id in the string pool

    optional int32 locus_id_index = 17;

  }

  }





  // The following fields contain supplemental data used to build IntervalStats, such as a string

  // The following fields contain supplemental data used to build IntervalStats, such as a string

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,10 @@ public class IntervalStats { 
                    event.mTaskRootClass = getCachedStringRef(stringPool.get(

                    event.mTaskRootClass = getCachedStringRef(stringPool.get(

                            parser.readInt(IntervalStatsProto.Event.TASK_ROOT_CLASS_INDEX) - 1));

                            parser.readInt(IntervalStatsProto.Event.TASK_ROOT_CLASS_INDEX) - 1));

                    break;

                    break;

                case (int) IntervalStatsProto.Event.LOCUS_ID_INDEX:

                    event.mLocusId = getCachedStringRef(stringPool.get(

                            parser.readInt(IntervalStatsProto.Event.LOCUS_ID_INDEX) - 1));

                    break;

                case ProtoInputStream.NO_MORE_FIELDS:

                case ProtoInputStream.NO_MORE_FIELDS:

                    // Handle default values for certain events types

                    // Handle default values for certain events types

                    switch (event.mEventType) {

                    switch (event.mEventType) {
@@ -252,6 +256,11 @@ public class IntervalStats { 
                                event.mNotificationChannelId = "";

                                event.mNotificationChannelId = "";

                            }

                            }

                            break;

                            break;

                        case LOCUS_ID_SET:

                            if (event.mLocusId == null) {

                                event.mLocusId = "";

                            }

                            break;

                    }

                    }

                    return event;

                    return event;

            }

            }

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -481,6 +481,13 @@ final class UsageStatsProto { 
                    }

                    }

                }

                }

                break;

                break;

            case UsageEvents.Event.LOCUS_ID_SET:

                if (event.mLocusId != null) {

                    final int locusIdIndex = stats.mStringCache.indexOf(event.mLocusId);

                    if (locusIdIndex >= 0) {

                        proto.write(IntervalStatsProto.Event.LOCUS_ID_INDEX, locusIdIndex + 1);

                    }

                }

        }

        }

        proto.end(token);

        proto.end(token);

    }

    }