Merge "Handle if mAlwaysUse is not be set" (926118c9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ public class UsbPermissionActivity extends AlertActivity
		intent.putExtra(UsbManager.EXTRA_DEVICE, mDevice);
		if (mPermissionGranted) {
		service.grantDevicePermission(mDevice, mUid);
		if (mAlwaysUse.isChecked()) {
		if (mAlwaysUse != null && mAlwaysUse.isChecked()) {
		final int userId = UserHandle.getUserId(mUid);
		service.setDevicePackage(mDevice, mPackageName, userId);
		}
		@@ -245,7 +245,7 @@ public class UsbPermissionActivity extends AlertActivity
		intent.putExtra(UsbManager.EXTRA_ACCESSORY, mAccessory);
		if (mPermissionGranted) {
		service.grantAccessoryPermission(mAccessory, mUid);
		if (mAlwaysUse.isChecked()) {
		if (mAlwaysUse != null && mAlwaysUse.isChecked()) {
		final int userId = UserHandle.getUserId(mUid);
		service.setAccessoryPackage(mAccessory, mPackageName, userId);
		}