The {@link Preference} contains the icon, package name and target SDK for the selected * app. Selecting this preference will also re-trigger the app selection dialog.
*/ - Preference createAppPreference(Drawable icon) { - final ApplicationInfo applicationInfo = getApplicationInfo(); - final Preference appPreference = new Preference(getPreferenceScreen().getContext()); + Preference createAppPreference(ApplicationInfo applicationInfo) { + final Context context = getPreferenceScreen().getContext(); + final Drawable icon = applicationInfo.loadIcon(context.getPackageManager()); + final Preference appPreference = new Preference(context); appPreference.setIcon(icon); appPreference.setSummary(mSelectedApp + " SDK " @@ -243,6 +261,11 @@ public class PlatformCompatDashboard extends DashboardFragment { private void startAppPicker() { final Intent intent = new Intent(getContext(), AppPicker.class); + // If build is neither userdebug nor eng, only include debuggable apps + final boolean debuggableBuild = mAndroidBuildClassifier.isDebuggableBuild(); + if (!debuggableBuild) { + intent.putExtra(AppPicker.EXTRA_DEBUGGABLE, true /* value */); + } startActivityForResult(intent, REQUEST_COMPAT_CHANGE_APP); } diff --git a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java index 693ed45b56a..d0cb97a8ac8 100644 --- a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java +++ b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java @@ -16,16 +16,23 @@ package com.android.settings.development.compat; +import static com.android.internal.compat.OverrideAllowedState.ALLOWED; +import static com.android.internal.compat.OverrideAllowedState.DISABLED_NOT_DEBUGGABLE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.compat.Compatibility.ChangeConfig; import android.content.Context; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; import android.os.RemoteException; @@ -38,7 +45,9 @@ import androidx.preference.SwitchPreference; import com.android.internal.compat.CompatibilityChangeConfig; import com.android.internal.compat.CompatibilityChangeInfo; +import com.android.internal.compat.IOverrideValidator; import com.android.internal.compat.IPlatformCompat; +import com.android.internal.compat.OverrideAllowedState; import com.android.settings.R; import org.junit.Before; @@ -66,6 +75,10 @@ public class PlatformCompatDashboardTest { private ApplicationInfo mApplicationInfo; @Mock private PreferenceManager mPreferenceManager; + @Mock + private IOverrideValidator mOverrideValidator; + @Mock + private PackageManager mPackageManager; private Context mContext; private CompatibilityChangeInfo[] mChanges; @@ -81,7 +94,11 @@ public class PlatformCompatDashboardTest { mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, ""); mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, ""); when(mPlatformCompat.listAllChanges()).thenReturn(mChanges); - mContext = RuntimeEnvironment.application; + when(mPlatformCompat.getOverrideValidator()).thenReturn(mOverrideValidator); + // By default, allow any change + when(mOverrideValidator.getOverrideAllowedState(anyLong(),anyString())) + .thenReturn(new OverrideAllowedState(ALLOWED, -1, -1)); + mContext = spy(RuntimeEnvironment.application); mPreferenceManager = new PreferenceManager(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mApplicationInfo.packageName = APP_NAME; @@ -91,6 +108,7 @@ public class PlatformCompatDashboardTest { doReturn(mPlatformCompat).when(mDashboard).getPlatformCompat(); doReturn(mPreferenceScreen).when(mDashboard).getPreferenceScreen(); doReturn(mPreferenceManager).when(mDashboard).getPreferenceManager(); + doReturn(mPackageManager).when(mContext).getPackageManager(); } @Test @@ -107,8 +125,10 @@ public class PlatformCompatDashboardTest { @Test public void createAppPreference_targetSdkEquals1_summaryReturnsAppNameAndTargetSdk() { mApplicationInfo.targetSdkVersion = 1; + Drawable icon = mock(Drawable.class); + when(mApplicationInfo.loadIcon(any(PackageManager.class))).thenReturn(icon); - Preference appPreference = mDashboard.createAppPreference(any(Drawable.class)); + Preference appPreference = mDashboard.createAppPreference(mApplicationInfo); assertThat(appPreference.getSummary()).isEqualTo(APP_NAME + " SDK 1"); } @@ -128,6 +148,7 @@ public class PlatformCompatDashboardTest { assertThat(enabledPreference.getSummary()).isEqualTo(mChanges[0].getName()); assertThat(enabledPreference instanceof SwitchPreference).isTrue(); assertThat(enabledSwitchPreference.isChecked()).isTrue(); + assertThat(enabledSwitchPreference.isEnabled()).isTrue(); } @Test @@ -139,10 +160,32 @@ public class PlatformCompatDashboardTest { Preference disabledPreference = mDashboard.createPreferenceForChange(mContext, disabledChange, config); - + assertThat(disabledPreference.getSummary()).isEqualTo(mChanges[1].getName()); SwitchPreference disabledSwitchPreference = (SwitchPreference) disabledPreference; assertThat(disabledSwitchPreference.isChecked()).isFalse(); + assertThat(disabledSwitchPreference.isEnabled()).isTrue(); + } + + @Test + public void createPreferenceForChange_cannotOverride_createDisabledEntry() + throws RemoteException { + CompatibilityChangeInfo enabledChange = mChanges[0]; + CompatibilityChangeConfig config = new CompatibilityChangeConfig( + new ChangeConfig(new HashSet