diff options
3 files changed, 9 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1ffdba16ac..564c859442 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -59,6 +59,7 @@ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.STATUS_BAR" /> <uses-permission android:name="android.permission.MANAGE_USB" /> + <uses-permission android:name="android.permission.MANAGE_DEBUGGING" /> <uses-permission android:name="android.permission.SET_POINTER_SPEED" /> <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index ce23e3fc03..e1fda67132 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.development; import android.content.Context; -import android.hardware.usb.IUsbManager; +import android.debug.IAdbManager; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; @@ -42,7 +42,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference @VisibleForTesting static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure"; - private final IUsbManager mUsbManager; + private final IAdbManager mAdbManager; private final DevelopmentSettingsDashboardFragment mFragment; public ClearAdbKeysPreferenceController(Context context, @@ -50,7 +50,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference super(context); mFragment = fragment; - mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE)); + mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(Context.ADB_SERVICE)); } @Override @@ -94,7 +94,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference public void onClearAdbKeysConfirmed() { try { - mUsbManager.clearUsbDebuggingKeys(); + mAdbManager.clearDebuggingKeys(); } catch (RemoteException e) { Log.e(TAG, "Unable to clear adb keys", e); } diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 56f1944147..6ab4d4c1dc 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -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) |