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

Merge "Track change to add ADB service"

Browse Source
This commit is contained in:
Kenny Root
2018-11-02 00:43:05 +00:00
committed by Android (Google) Code Review
parent 0e11b18cf0 e7bbf8f186
commit f316ab8de6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -59,6 +59,7 @@
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.STATUS_BAR" /> <uses-permission android:name="android.permission.STATUS_BAR" />
<uses-permission android:name="android.permission.MANAGE_USB" /> <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_POINTER_SPEED" />
<uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" /> <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

8
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.development; package com.android.settings.development;
import android.content.Context; import android.content.Context;
import android.hardware.usb.IUsbManager; import android.debug.IAdbManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -42,7 +42,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference
@VisibleForTesting @VisibleForTesting
static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure"; static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure";
private final IUsbManager mUsbManager; private final IAdbManager mAdbManager;
private final DevelopmentSettingsDashboardFragment mFragment; private final DevelopmentSettingsDashboardFragment mFragment;
public ClearAdbKeysPreferenceController(Context context, public ClearAdbKeysPreferenceController(Context context,
@@ -50,7 +50,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference
super(context); super(context);
mFragment = fragment; mFragment = fragment;
mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE)); mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(Context.ADB_SERVICE));
} }
@Override @Override
@@ -94,7 +94,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference
public void onClearAdbKeysConfirmed() { public void onClearAdbKeysConfirmed() {
try { try {
mUsbManager.clearUsbDebuggingKeys(); mAdbManager.clearDebuggingKeys();
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Unable to clear adb keys", e); Log.e(TAG, "Unable to clear adb keys", e);
} }

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