Add developer option to opt-in updatable graphics driver.
To facilitate developers to develop their applications against the updated graphics driver, we provide a developer option to select one application to opt-in. The selected application will always use updated graphics driver by default. BUG: 119221883 Test: Build, flash, boot, select a game and verify with prototype. Change-Id: I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3
This commit is contained in:
@@ -9964,6 +9964,13 @@
|
|||||||
<!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->
|
<!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->
|
||||||
<string name="angle_enabled_app_set">ANGLE enabled application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
|
<string name="angle_enabled_app_set">ANGLE enabled application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
|
||||||
|
|
||||||
|
<!-- UI debug setting: select an app to use updated graphics driver [CHAR LIMIT=100] -->
|
||||||
|
<string name="updated_gfx_driver_dev_opt_in_app">Select app to use updated graphics driver</string>
|
||||||
|
<!-- UI debug setting: no app selected to use updated GPU driver [CHAR LIMIT=100] -->
|
||||||
|
<string name="updated_gfx_driver_dev_opt_in_app_not_set">No selected app to use updated graphics driver</string>
|
||||||
|
<!-- UI debug setting: app selected to use updated graphics driver [CHAR LIMIT=NONE] -->
|
||||||
|
<string name="updated_gfx_driver_dev_opt_in_app_set">Opt in application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
|
||||||
|
|
||||||
<!-- Slices Strings -->
|
<!-- Slices Strings -->
|
||||||
|
|
||||||
<!-- Summary text on a card explaining that a setting does not exist / is not supported on the device [CHAR_LIMIT=NONE]-->
|
<!-- Summary text on a card explaining that a setting does not exist / is not supported on the device [CHAR_LIMIT=NONE]-->
|
||||||
|
@@ -422,6 +422,10 @@
|
|||||||
<Preference android:key="angle_enabled_app"
|
<Preference android:key="angle_enabled_app"
|
||||||
android:title="@string/angle_enabled_app" />
|
android:title="@string/angle_enabled_app" />
|
||||||
|
|
||||||
|
<Preference android:key="updated_gfx_driver_dev_opt_in_app"
|
||||||
|
android:summary="@string/updated_gfx_driver_dev_opt_in_app_summary"
|
||||||
|
android:title="@string/updated_gfx_driver_dev_opt_in_app" />
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
@@ -27,4 +27,6 @@ public interface DevelopmentOptionsActivityRequestCodes {
|
|||||||
int REQUEST_MOCK_LOCATION_APP = 2;
|
int REQUEST_MOCK_LOCATION_APP = 2;
|
||||||
|
|
||||||
int REQUEST_CODE_ANGLE_ENABLED_APP = 3;
|
int REQUEST_CODE_ANGLE_ENABLED_APP = 3;
|
||||||
|
|
||||||
|
int REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = 4;
|
||||||
}
|
}
|
||||||
|
@@ -406,6 +406,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new WaitForDebuggerPreferenceController(context));
|
controllers.add(new WaitForDebuggerPreferenceController(context));
|
||||||
controllers.add(new EnableGpuDebugLayersPreferenceController(context));
|
controllers.add(new EnableGpuDebugLayersPreferenceController(context));
|
||||||
controllers.add(new AngleEnabledAppPreferenceController(context, fragment));
|
controllers.add(new AngleEnabledAppPreferenceController(context, fragment));
|
||||||
|
controllers.add(new UpdatedGfxDriverDevOptInPreferenceController(context, fragment));
|
||||||
controllers.add(new VerifyAppsOverUsbPreferenceController(context));
|
controllers.add(new VerifyAppsOverUsbPreferenceController(context));
|
||||||
controllers.add(new LogdSizePreferenceController(context));
|
controllers.add(new LogdSizePreferenceController(context));
|
||||||
controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
|
controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
|
||||||
|
@@ -0,0 +1,124 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2018 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
|
||||||
|
.REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.ApplicationInfo;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
// TODO(b/119221883): Need to override isAvailable() to return false when updatable graphics driver is not supported.
|
||||||
|
public class UpdatedGfxDriverDevOptInPreferenceController
|
||||||
|
extends DeveloperOptionsPreferenceController
|
||||||
|
implements PreferenceControllerMixin, OnActivityResultListener {
|
||||||
|
|
||||||
|
private static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY =
|
||||||
|
"updated_gfx_driver_dev_opt_in_app";
|
||||||
|
|
||||||
|
private final DevelopmentSettingsDashboardFragment mFragment;
|
||||||
|
private final PackageManager mPackageManager;
|
||||||
|
|
||||||
|
public UpdatedGfxDriverDevOptInPreferenceController(Context context,
|
||||||
|
DevelopmentSettingsDashboardFragment fragment) {
|
||||||
|
super(context);
|
||||||
|
mFragment = fragment;
|
||||||
|
mPackageManager = mContext.getPackageManager();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||||
|
if (UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY.equals(preference.getKey())) {
|
||||||
|
// pass it on to settings
|
||||||
|
final Intent intent = getActivityStartIntent();
|
||||||
|
mFragment.startActivityForResult(intent,
|
||||||
|
REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
updatePreferenceSummary();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
if (requestCode != REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP
|
||||||
|
|| resultCode != Activity.RESULT_OK) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Settings.Global.putString(mContext.getContentResolver(),
|
||||||
|
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, data.getAction());
|
||||||
|
updatePreferenceSummary();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
|
super.onDeveloperOptionsSwitchDisabled();
|
||||||
|
mPreference.setSummary(mContext.getResources().getString(
|
||||||
|
R.string.updated_gfx_driver_dev_opt_in_app_not_set));
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
Intent getActivityStartIntent() {
|
||||||
|
Intent intent = new Intent(mContext, AppPicker.class);
|
||||||
|
intent.putExtra(AppPicker.EXTRA_NON_SYSTEM, true /* value */);
|
||||||
|
return intent;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePreferenceSummary() {
|
||||||
|
final String updatedGfxDriverDevOptInApp = Settings.Global.getString(
|
||||||
|
mContext.getContentResolver(), Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP);
|
||||||
|
if (updatedGfxDriverDevOptInApp != null && !updatedGfxDriverDevOptInApp.isEmpty()) {
|
||||||
|
mPreference.setSummary(mContext.getResources().getString(
|
||||||
|
R.string.updated_gfx_driver_dev_opt_in_app_set,
|
||||||
|
getAppLabel(updatedGfxDriverDevOptInApp)));
|
||||||
|
} else {
|
||||||
|
mPreference.setSummary(mContext.getResources().getString(
|
||||||
|
R.string.updated_gfx_driver_dev_opt_in_app_not_set));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getAppLabel(String applicationPackageName) {
|
||||||
|
try {
|
||||||
|
final ApplicationInfo ai = mPackageManager.getApplicationInfo(applicationPackageName,
|
||||||
|
PackageManager.GET_DISABLED_COMPONENTS);
|
||||||
|
final CharSequence lab = mPackageManager.getApplicationLabel(ai);
|
||||||
|
return lab != null ? lab.toString() : applicationPackageName;
|
||||||
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
|
return applicationPackageName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,131 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2018 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP;
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
import org.robolectric.util.ReflectionHelpers;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
public class UpdatedGfxDriverDevOptInPreferenceControllerTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
@Mock
|
||||||
|
private DevelopmentSettingsDashboardFragment mFragment;
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private Preference mPreference;
|
||||||
|
private UpdatedGfxDriverDevOptInPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mController = spy(new UpdatedGfxDriverDevOptInPreferenceController(mContext, mFragment));
|
||||||
|
mPreference = new Preference(mContext);
|
||||||
|
mPreference.setKey(mController.getPreferenceKey());
|
||||||
|
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
|
.thenReturn(mPreference);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void handlePreferenceTreeClick_preferenceClicked_launchActivity() {
|
||||||
|
final Intent activityStartIntent = new Intent(mContext, AppPicker.class);
|
||||||
|
final String preferenceKey = mController.getPreferenceKey();
|
||||||
|
doReturn(activityStartIntent).when(mController).getActivityStartIntent();
|
||||||
|
mController.handlePreferenceTreeClick(mPreference);
|
||||||
|
|
||||||
|
verify(mFragment).startActivityForResult(activityStartIntent,
|
||||||
|
REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_foobarAppSelected_shouldUpdateSummaryWithUpdatedDriverDevOptInAppLabel() {
|
||||||
|
final String selectedApp = "foobar";
|
||||||
|
final ContentResolver contentResolver = mContext.getContentResolver();
|
||||||
|
Settings.Global.putString(contentResolver,
|
||||||
|
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, selectedApp);
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_set, selectedApp));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_noAppSelected_shouldUpdateSummaryWithNoAppSelected() {
|
||||||
|
final String selectedApp = null;
|
||||||
|
final ContentResolver contentResolver = mContext.getContentResolver();
|
||||||
|
Settings.Global.putString(contentResolver,
|
||||||
|
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, selectedApp);
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_not_set));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithUpdatedDriverDevOptInLabel() {
|
||||||
|
Intent activityResultIntent = new Intent(mContext, AppPicker.class);
|
||||||
|
final String appLabel = "foobar";
|
||||||
|
activityResultIntent.setAction(appLabel);
|
||||||
|
final boolean result = mController
|
||||||
|
.onActivityResult(REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, Activity.RESULT_OK,
|
||||||
|
activityResultIntent);
|
||||||
|
|
||||||
|
assertThat(result).isTrue();
|
||||||
|
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_set, appLabel));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onActivityResult_badRequestCode_shouldReturnFalse() {
|
||||||
|
assertThat(mController.onActivityResult(
|
||||||
|
-1 /* requestCode */, -1 /* resultCode */, null /* intent */)).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
|
||||||
|
mController.onDeveloperOptionsSwitchDisabled();
|
||||||
|
|
||||||
|
assertThat(mPreference.isEnabled()).isFalse();
|
||||||
|
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_not_set));
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user