PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I60df429605c78749c0259f7efffab026210a4977
This commit is contained in:
Andrei-Valentin Onea
2020-10-19 14:56:40 +00:00
committed by Automerger Merge Worker
parent 0e5fdb184d 38747f76f3
commit 8e111e3de3
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/development/compat/PlatformCompatDashboard.java
View File

@@ -149,13 +149,13 @@ public class PlatformCompatDashboard extends DashboardFragment {
final List<CompatibilityChangeInfo> disabledChanges = new ArrayList<>();
final Map<Integer, List<CompatibilityChangeInfo>> targetSdkChanges = new TreeMap<>();
for (CompatibilityChangeInfo change : mChanges) {
if (change.getEnableAfterTargetSdk() != 0) {
if (change.getEnableSinceTargetSdk() != 0) {
List<CompatibilityChangeInfo> sdkChanges;
if (!targetSdkChanges.containsKey(change.getEnableAfterTargetSdk())) {
if (!targetSdkChanges.containsKey(change.getEnableSinceTargetSdk())) {
sdkChanges = new ArrayList<>();
targetSdkChanges.put(change.getEnableAfterTargetSdk(), sdkChanges);
targetSdkChanges.put(change.getEnableSinceTargetSdk(), sdkChanges);
} else {
sdkChanges = targetSdkChanges.get(change.getEnableAfterTargetSdk());
sdkChanges = targetSdkChanges.get(change.getEnableSinceTargetSdk());
}
sdkChanges.add(change);
} else if (change.getDisabled()) {