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

Commit f8d659af authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5140444 from a31c2ec2 to pi-qpr2-release

Change-Id: I51e2f0730950c181af8670b76357bbd9f379b015
parents 9b65905c a31c2ec2
Loading
Loading
Loading
Loading
+2 −33
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@

package com.android.settings.development.qstile;

import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
@@ -28,7 +26,6 @@ import android.provider.Settings;
import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
import android.support.annotation.VisibleForTesting;
import android.util.EventLog;
import android.util.Log;
import android.view.IWindowManager;
import android.view.ThreadedRenderer;
@@ -37,8 +34,6 @@ import android.view.WindowManagerGlobal;
import android.widget.Toast;

import com.android.internal.app.LocalePicker;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;

public abstract class DevelopmentTiles extends TileService {
@@ -55,33 +50,7 @@ public abstract class DevelopmentTiles extends TileService {
    }

    public void refresh() {
        final int state;
        if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)) {
            // Reset to disabled state if dev option is off.
            if (isEnabled()) {
                setIsEnabled(false);
                SystemPropPoker.getInstance().poke();
            }
            final ComponentName cn = new ComponentName(getPackageName(), getClass().getName());
            try {
                getPackageManager().setComponentEnabledSetting(
                        cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                        PackageManager.DONT_KILL_APP);
                final IStatusBarService statusBarService = IStatusBarService.Stub.asInterface(
                        ServiceManager.checkService(Context.STATUS_BAR_SERVICE));
                if (statusBarService != null) {
                    EventLog.writeEvent(0x534e4554, "117770924");  // SaftyNet
                    statusBarService.remTile(cn);
                }
            } catch (RemoteException e) {
                Log.e(TAG, "Failed to modify QS tile for component " +
                        cn.toString(), e);
            }
            state = Tile.STATE_UNAVAILABLE;
        } else {
            state = isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
        }
        getQsTile().setState(state);
        getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
        getQsTile().updateTile();
    }

+0 −71
Original line number Diff line number Diff line
/*
 * Copyright (C) 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.qstile;

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 android.content.ComponentName;
import android.content.pm.PackageManager;
import android.service.quicksettings.Tile;

import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.development.DevelopmentSettingsEnabler;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;

@RunWith(SettingsRobolectricTestRunner.class)
public class DevelopmentTilesTest {

    @Mock
    private Tile mTile;
    @Mock
    private PackageManager mPackageManager;

    private DevelopmentTiles mService;

    @Before
    public void setUp() {
        MockitoAnnotations.initMocks(this);
        mService = spy(Robolectric.setupService(DevelopmentTiles.ShowLayout.class));
        doReturn(mTile).when(mService).getQsTile();
    }

    @Test
    public void refresh_devOptionIsDisabled_shouldResetTileValue() {
        final ComponentName cn = new ComponentName(
                mService.getPackageName(), mService.getClass().getName());
        doReturn(mPackageManager).when(mService).getPackageManager();

        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mService, false);
        mService.setIsEnabled(true);

        mService.refresh();

        verify(mPackageManager).setComponentEnabledSetting(cn,
                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                PackageManager.DONT_KILL_APP);
        assertThat(mService.isEnabled()).isFalse();
    }
}