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

Track change to add ADB service

Browse Source 
The ADB code has moved to its own service, so this is needed to change
which AIDL is called.

Test: make
Bug: 63820489
Change-Id: I5397a3431db414f58dae060c96cf1386da231c50
This commit is contained in:
Kenny Root
2018-01-23 21:53:53 +09:00
parent 792e5ecf91
commit e7bbf8f186
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
View File

@@ -28,7 +28,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.hardware.usb.IUsbManager;
import android.debug.IAdbManager;
import android.os.RemoteException;
import android.os.SystemProperties;
@@ -60,7 +60,7 @@ public class ClearAdbKeysPreferenceControllerTest {
@Mock
private SwitchPreference mPreference;
@Mock
private IUsbManager mUsbManager;
private IAdbManager mAdbManager;
@Mock
private DevelopmentSettingsDashboardFragment mFragment;
@@ -71,7 +71,7 @@ public class ClearAdbKeysPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
final Context context = RuntimeEnvironment.application;
mController = spy(new ClearAdbKeysPreferenceController(context, mFragment));
ReflectionHelpers.setField(mController, "mUsbManager", mUsbManager);
ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@@ -168,7 +168,7 @@ public class ClearAdbKeysPreferenceControllerTest {
public void onClearAdbKeysConfirmed_shouldClearKeys() throws RemoteException {
mController.onClearAdbKeysConfirmed();
verify(mUsbManager).clearUsbDebuggingKeys();
verify(mAdbManager).clearDebuggingKeys();
}
@Implements(ClearAdbKeysWarningDialog.class)