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

Commit 9e4380fd authored by WyattRiley's avatar WyattRiley
Browse files

Fix and improve output of Historical Requests 

Fixes comparator bug that lost items in the sort
Reformats output string in dumpsys

Fixes: 155795136
Test: On-device, adb shell dumpsys location WAI

Change-Id: I8c3acc22d812f736b8c04a0c8fa1a275b4955bfc
parent 971448af

services/core/java/com/android/server/location/LocationManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -2667,8 +2667,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                    mRequestStatistics.statistics);

            for (Map.Entry<PackageProviderKey, PackageStatistics> entry

                    : sorted.entrySet()) {

                PackageProviderKey key = entry.getKey();

                ipw.println(key.mPackageName + ": " + key.mProviderName + ": " + entry.getValue());

                ipw.println(entry.getKey() + ": " + entry.getValue());

            }

            ipw.decreaseIndent();

services/core/java/com/android/server/location/LocationRequestStatistics.java

+20 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.location;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.SystemClock;

import android.util.Log;
@@ -25,6 +26,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.IndentingPrintWriter;



import java.util.ArrayList;

import java.util.Comparator;

import java.util.HashMap;

import java.util.Objects;
@@ -121,14 +123,30 @@ public class LocationRequestStatistics { 
            this.mProviderName = providerName;

        }



        @NonNull

        @Override

        public String toString() {

            return mProviderName + ": " + mPackageName

                    + (mFeatureId == null ? "" : ": " + mFeatureId);

        }



        /**

         * Sort by provider, then package, then feature

         */

        @Override

        public int compareTo(PackageProviderKey other) {

            final int providerCompare = mProviderName.compareTo(other.mProviderName);

            if (providerCompare != 0) {

                return providerCompare;

            } else {

                return mProviderName.compareTo(other.mProviderName);

            }



            final int packageCompare = mPackageName.compareTo(other.mPackageName);

            if (packageCompare != 0) {

                return packageCompare;

            }



            return Objects.compare(mFeatureId, other.mFeatureId, Comparator

                    .nullsFirst(String::compareTo));

        }



        @Override