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

Commit 77e4f7b3 authored by atrost's avatar atrost
Browse files

Show only listUIChanges instead of all 

Use the new method that filters out changes that shouldn't be in the
developer UI.

Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Merged-In: I5b461b33484a38d0c6a5b7bf7e928231dd662668
parent 2dd19966

src/com/android/settings/development/compat/PlatformCompatDashboard.java

+2 −7
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ 


package com.android.settings.development.compat;



import static com.android.settings.development.AppPicker.EXTRA_DEBUGGABLE;

import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_COMPAT_CHANGE_APP;

import static com.android.internal.compat.OverrideAllowedState.ALLOWED;

import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_COMPAT_CHANGE_APP;



import android.app.Activity;

import android.app.settings.SettingsEnums;
@@ -27,9 +26,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -45,8 +42,6 @@ import com.android.internal.compat.AndroidBuildClassifier; 
import com.android.internal.compat.CompatibilityChangeConfig;

import com.android.internal.compat.CompatibilityChangeInfo;

import com.android.internal.compat.IPlatformCompat;

import com.android.internal.compat.IOverrideValidator;

import com.android.internal.compat.OverrideAllowedState;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.development.AppPicker;
@@ -105,7 +100,7 @@ public class PlatformCompatDashboard extends DashboardFragment { 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        try {

            mChanges = getPlatformCompat().listAllChanges();

            mChanges = getPlatformCompat().listUIChanges();

        } catch (RemoteException e) {

            throw new RuntimeException("Could not list changes!", e);

        }

tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class PlatformCompatDashboardTest { 
        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_After_SDK_1_1", 1, false, false, "");

        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, false, "");

        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, false, "");

        when(mPlatformCompat.listAllChanges()).thenReturn(mChanges);

        when(mPlatformCompat.listUIChanges()).thenReturn(mChanges);

        when(mPlatformCompat.getOverrideValidator()).thenReturn(mOverrideValidator);

        // By default, allow any change

        when(mOverrideValidator.getOverrideAllowedState(anyLong(),anyString()))