diff options
| author | Kenny Root <kroot@google.com> | 2018-01-23 21:53:53 +0900 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2018-10-31 16:11:03 +0900 |
| commit | e7bbf8f186b13339c42cde15f5c3591330c9e5a6 (patch) | |
| tree | e387430618b21f54af2e73736da1ea1cebf1400c /src/com/android/settings/development/ClearAdbKeysPreferenceController.java | |
| parent | 792e5ecf9155f07ecd1c553a6f517033c89ca58e (diff) | |
| download | packages_apps_Settings-e7bbf8f186b13339c42cde15f5c3591330c9e5a6.tar.gz packages_apps_Settings-e7bbf8f186b13339c42cde15f5c3591330c9e5a6.tar.bz2 packages_apps_Settings-e7bbf8f186b13339c42cde15f5c3591330c9e5a6.zip | |
Track change to add ADB service
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
Diffstat (limited to 'src/com/android/settings/development/ClearAdbKeysPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/ClearAdbKeysPreferenceController.java | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |