Removed unneeded call to PreferenceControllerTestUtil.assignPreference()
Bug: 206155448
Bug: 207175350
Test: atest \
com.android.car.settings.enterprise.AdminGrantedCameraPermissionApplicationListPreferenceControllerTest \
com.android.car.settings.enterprise.AdminGrantedCameraPermissionPreferenceControllerTest \
com.android.car.settings.enterprise.AdminGrantedLocationPermissionsApplicationListPreferenceControllerTest \
com.android.car.settings.enterprise.AdminGrantedLocationPermissionsPreferenceControllerTest \
com.android.car.settings.enterprise.AdminGrantedMicrophonePermissionApplicationListPreferenceControllerTest \
com.android.car.settings.enterprise.AdminGrantedMicrophonePermissionPreferenceControllerTest
Change-Id: Ib08751a27a0cabfb50ee3e318660337c37e9e6bb
Merged-In: Ib08751a27a0cabfb50ee3e318660337c37e9e6bb
(cherry picked from commit 737ab9470d7e3f28126ac8cf21766f09ca4af385)
diff --git a/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsApplicationListPreferenceControllerTestCase.java b/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsApplicationListPreferenceControllerTestCase.java
index 9eb0290..21db0bd 100644
--- a/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsApplicationListPreferenceControllerTestCase.java
+++ b/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsApplicationListPreferenceControllerTestCase.java
@@ -42,7 +42,6 @@
import androidx.preference.PreferenceGroup;
import androidx.test.annotation.UiThreadTest;
-import com.android.car.settings.common.PreferenceControllerTestUtil;
import com.android.car.settings.enterprise.BaseEnterprisePreferenceControllerTestCase.DummyPreferenceGroup;
import com.android.car.settings.testutils.TextDrawable;
import com.android.car.settingslib.applications.ApplicationFeatureProvider;
@@ -86,7 +85,6 @@
public void setExtraFixtures() {
mSpiedController = spy(newController(mApplicationFeatureProvider));
mPreferenceGroup = new DummyPreferenceGroup(mSpiedContext);
- PreferenceControllerTestUtil.assignPreference(mSpiedController, mPreferenceGroup);
}
protected abstract C newController(ApplicationFeatureProvider provider);
diff --git a/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsPreferenceControllerTestCase.java b/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsPreferenceControllerTestCase.java
index dc02218..05459f1 100644
--- a/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsPreferenceControllerTestCase.java
+++ b/tests/unit/src/com/android/car/settings/enterprise/BaseAdminGrantedPermissionsPreferenceControllerTestCase.java
@@ -33,7 +33,6 @@
import androidx.preference.Preference;
import com.android.car.settings.R;
-import com.android.car.settings.common.PreferenceControllerTestUtil;
import com.android.car.settingslib.applications.ApplicationFeatureProvider;
import com.android.car.settingslib.applications.ApplicationFeatureProvider.NumberOfAppsCallback;
import com.android.internal.util.Preconditions;
@@ -66,8 +65,6 @@
@Before
public void setController() {
mSpiedController = spy(newController(mApplicationFeatureProvider));
-
- PreferenceControllerTestUtil.assignPreference(mSpiedController, mPreference);
}
protected abstract C newController(ApplicationFeatureProvider provider);
