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

Remove more wrappers

Browse Source 
Bug: 76167422
Test: make RunSettingsRoboTests -j40
Change-Id: I0dc42c483ae92d508dec94e42573b55ced0e4bb0
This commit is contained in:
Fan Zhang
2018-03-30 11:33:08 -07:00
parent e645558049
commit c0c3eaa66c
19 changed files with 130 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java
View File

@@ -22,11 +22,11 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.content.pm.ActivityInfo;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.ActivityInfoWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -84,9 +84,9 @@ public class PictureInPictureDetailsTest {
private boolean checkPackageHasPictureInPictureActivities(String packageName,
boolean... resizeableActivityState) {
ActivityInfoWrapper[] activities = null;
ActivityInfo[] activities = null;
if (resizeableActivityState.length > 0) {
activities = new ActivityInfoWrapper[resizeableActivityState.length];
activities = new ActivityInfo[resizeableActivityState.length];
for (int i = 0; i < activities.length; i++) {
activities[i] = new MockActivityInfo(resizeableActivityState[i]);
}
@@ -95,12 +95,11 @@ public class PictureInPictureDetailsTest {
activities);
}
private class MockActivityInfo extends ActivityInfoWrapper {
private class MockActivityInfo extends ActivityInfo {
private boolean mSupportsPictureInPicture;
private MockActivityInfo(boolean supportsPictureInPicture) {
super(null);
mSupportsPictureInPicture = supportsPictureInPicture;
}