Merge "Do not add SelectUsbConfigPreferenceController if USB is disabled."
This commit is contained in:
committed by
Android (Google) Code Review
commit
197c0c83de
@@ -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;
|
||||
@@ -109,6 +110,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);
|
||||
|
Reference in New Issue
Block a user