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

Commit c5b8287f authored by ykhung's avatar ykhung Committed by YK Hung
Browse files

Replace HashSet with memory efficient ArraySet collection 

https://developer.android.com/reference/android/util/ArraySet

Bug: 195306545
Test: N/A
Change-Id: I3f5831f2c5b5ec5ca50d312331c42eb90def2c61
parent 3ed73b7b

src/com/android/settings/fuelgauge/ConvertUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.LocaleList; 
import android.os.UserHandle;

import android.text.format.DateFormat;

import android.text.format.DateUtils;

import android.util.ArraySet;

import android.util.Log;



import androidx.annotation.VisibleForTesting;
@@ -32,7 +33,6 @@ import java.lang.annotation.RetentionPolicy; 
import java.time.Duration;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Locale;
@@ -182,7 +182,7 @@ public final class ConvertUtils { 
            }



            // Collects all keys in these three time slot records as all populations.

            final Set<String> allBatteryHistEntryKeys = new HashSet<>();

            final Set<String> allBatteryHistEntryKeys = new ArraySet<>();

            allBatteryHistEntryKeys.addAll(currentBatteryHistMap.keySet());

            allBatteryHistEntryKeys.addAll(nextBatteryHistMap.keySet());

            allBatteryHistEntryKeys.addAll(nextTwoBatteryHistMap.keySet());

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.net.Uri;

import android.os.Process;

import android.util.ArraySet;

import android.util.SparseIntArray;



import com.android.internal.util.ArrayUtils;

import com.android.settingslib.fuelgauge.Estimate;



import java.util.HashSet;

import java.util.Map;

import java.util.Set;
@@ -169,7 +169,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 


    @Override

    public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {

        return new HashSet<>();

        return new ArraySet<>();

    }



    @Override