PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dead code.

Browse Source 
Bug: n/a
Test: rebuild
Change-Id: I71f8d9d99bbff1186e8df518ec8d27db3447ffbe
This commit is contained in:
Fan Zhang
2019-01-29 16:00:19 -08:00
parent c41ea719be
commit c3fd289969
16 changed files with 55 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/Android.mk
View File

@@ -3,11 +3,11 @@ LOCAL_PATH := $(call my-dir)
SETTINGS_AOSP_PATH := packages/apps/Settings
#############################################################
# Build SettingsTest.apk which includes test-only resources.#
# Build SettingsRoboTestStub.apk which includes test-only resources.#
#############################################################
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SettingsTest
LOCAL_PACKAGE_NAME := SettingsRoboTestStub
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
@@ -77,7 +77,7 @@ LOCAL_JAVA_LIBRARIES := \
mockito-robolectric-prebuilt \
truth-prebuilt
LOCAL_INSTRUMENTATION_FOR := SettingsTest
LOCAL_INSTRUMENTATION_FOR := SettingsRoboTestStub
LOCAL_MODULE_TAGS := optional
@@ -100,7 +100,7 @@ LOCAL_JAVA_LIBRARIES := \
mockito-robolectric-prebuilt \
truth-prebuilt
LOCAL_TEST_PACKAGE := SettingsTest
LOCAL_TEST_PACKAGE := SettingsRoboTestStub
LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \
frameworks/base/packages/SettingsLib/search/src \

4
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterytip;
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.when;
@@ -60,7 +59,8 @@ public class BatteryTipUtilsTest {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
when(mSettingsActivity.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
mRestrictAppTip = spy(new RestrictAppTip(BatteryTip.StateType.NEW, new ArrayList<>()));
mEarlyWarningTip = spy(
new EarlyWarningTip(BatteryTip.StateType.NEW, true /* powerSaveModeOn */));