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

Do not add SelectUsbConfigPreferenceController if USB is disabled.

Browse Source 
Bug: 69479572
Test: Local cherry-picked to master-arc-dev, and deployed cheets_x86 to
a ChromeOS device. Developer Options show up.
Updated SelectUsbConfigPreferenceControllerTest.

Change-Id: I8c6a4501849e67c92f50b8a3781260e9dbcdaf20
This commit is contained in:
Ben Lin
2017-11-17 16:22:50 -08:00
parent 222f4447a3
commit 3f5d58b981
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/development/SelectUsbConfigPreferenceController.java
View File

@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.hardware.usb.UsbManager;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
@@ -104,6 +105,14 @@ public class SelectUsbConfigPreferenceController extends
mContext.unregisterReceiver(mUsbReceiver);
}
@Override
public boolean isAvailable() {
final PackageManager packageManager = mContext.getPackageManager();
return packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)
|| packageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY);
}
@Override
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);