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
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -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);
}