Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933

Change-Id: I6d18a75d568c5b08efdc9212a4c66b9409f15d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zaiyue Xue
2023-03-14 07:30:25 +00:00
committed by Automerger Merge Worker

View File

@@ -26,6 +26,7 @@ import android.util.SparseIntArray;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.settingslib.fuelgauge.Estimate; import com.android.settingslib.fuelgauge.Estimate;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -83,7 +84,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
@Override @Override
public List<String> getSystemAppsAllowlist() { public List<String> getSystemAppsAllowlist() {
return null; return new ArrayList<>();
} }
@Override @Override