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

Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
  Change default USB configuration to a RestrictedPreference
This commit is contained in:
TreeHugger Robot
2022-03-09 17:54:27 +00:00
committed by Android (Google) Code Review
parent 92245b8f57 15d0cfed3a
commit 7b40a559bf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java
View File

@@ -32,7 +32,7 @@ import android.os.UserHandle;
import androidx.preference.PreferenceScreen;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +48,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest {
private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test");
@Mock
private RestrictedSwitchPreference mPreference;
private RestrictedPreference mPreference;
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock