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

Commit 4e7f57ad authored by Cody Northrop's avatar Cody Northrop
Browse files

Rootless GPU Debug 

This commit adds a new toggle to allow loading GPU debug
layers from the base directory of debuggable applications.

It corresponds to changes to GraphicsEnvironment to look for
matching application and layer list, which are then selectively
passed on the native components, like the Vulkan loader.

Bug: 63708377
Test: Manual, CTS tests to follow
Change-Id: Id6917a7b34df4a37905fafe08a4c1b6503abbb0c
parent e50254dc

res/xml/development_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -177,6 +177,11 @@ 
            android:title="@string/feature_flags_dashboard_title"

            android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard"/>



        <SwitchPreference

            android:key="enable_gpu_debug_layers"

            android:title="@string/enable_gpu_debug_layers"

            android:summary="@string/enable_gpu_debug_layers_summary"/>



    </PreferenceCategory>



    <PreferenceCategory android:key="debug_networking_category"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new DebugViewAttributesPreferenceController(context));

        controllers.add(new SelectDebugAppPreferenceController(context, fragment));

        controllers.add(new WaitForDebuggerPreferenceController(context));

        controllers.add(new EnableGpuDebugLayersPreferenceController(context));

        controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));

        controllers.add(new LogdSizePreferenceControllerV2(context));

        controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));

src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java

0 → 100644
+86 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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 android.content.Context;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



public class EnableGpuDebugLayersPreferenceController extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,

        PreferenceControllerMixin {



    private static final String ENABLE_GPU_DEBUG_LAYERS_KEY = "enable_gpu_debug_layers";



    @VisibleForTesting

    static final int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    static final int SETTING_VALUE_OFF = 0;



    private SwitchPreference mPreference;



    public EnableGpuDebugLayersPreferenceController(Context context) {

        super(context);

    }



    @Override

    public String getPreferenceKey() {

        return ENABLE_GPU_DEBUG_LAYERS_KEY;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);



        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isEnabled = (Boolean) newValue;

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS,

                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final int enableGpuDebugLayersMode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);

        mPreference.setChecked(enableGpuDebugLayersMode != SETTING_VALUE_OFF);

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        mPreference.setEnabled(true);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);

        mPreference.setEnabled(false);

        mPreference.setChecked(false);

    }

}

tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java

0 → 100644
+124 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.EnableGpuDebugLayersPreferenceController

        .SETTING_VALUE_OFF;

import static com.android.settings.development.EnableGpuDebugLayersPreferenceController

        .SETTING_VALUE_ON;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settings.TestConfig;

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.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class EnableGpuDebugLayersPreferenceControllerTest {



    @Mock

    private SwitchPreference mPreference;

    @Mock

    private PreferenceScreen mPreferenceScreen;



    private Context mContext;

    private EnableGpuDebugLayersPreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new EnableGpuDebugLayersPreferenceController(mContext);

        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(

                mPreference);

        mController.displayPreference(mPreferenceScreen);

    }



    @Test

    public void onPreferenceChange_settingEnabled_enableGpuDebugLayersShouldBeOn() {

        mController.onPreferenceChange(mPreference, true /* new value */);



        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, -1 /* default */);



        assertThat(mode).isEqualTo(SETTING_VALUE_ON);

    }



    @Test

    public void onPreferenceChange_settingDisabled_enableGpuDebugLayersShouldBeOff() {

        mController.onPreferenceChange(mPreference, false /* new value */);



        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, -1 /* default */);



        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);

    }



    @Test

    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);

        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void updateState_settingEnabled_preferenceShouldBeChecked() {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_ON);

        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {

        mController.onDeveloperOptionsSwitchDisabled();



        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_GPU_DEBUG_LAYERS, -1 /* default */);



        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);

        verify(mPreference).setChecked(false);

        verify(mPreference).setEnabled(false);

    }



    @Test

    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {

        mController.onDeveloperOptionsSwitchEnabled();



        verify(mPreference).setEnabled(true);

    }

}