Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-31 18:59:52 +00:00
committed by Android (Google) Code Review
parent 343d82adf6 8f7eadf906
commit 978b8e1842
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
View File

@@ -55,8 +55,6 @@ public class DeviceChooserActivity extends Activity {
Log.e(LOG_TAG, "About to show UI, but no devices to show"); Log.e(LOG_TAG, "About to show UI, but no devices to show");
} }
mPairButton = findViewById(R.id.button_pair);
if (getService().mRequest.isSingleDevice()) { if (getService().mRequest.isSingleDevice()) {
setContentView(R.layout.device_confirmation); setContentView(R.layout.device_confirmation);
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0); final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
@@ -64,11 +62,13 @@ public class DeviceChooserActivity extends Activity {
R.string.confirmation_title, R.string.confirmation_title,
getCallingAppName(), getCallingAppName(),
selectedDevice.getDisplayName()), 0)); selectedDevice.getDisplayName()), 0));
mPairButton = findViewById(R.id.button_pair);
mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice)); mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice));
getService().mSelectedDevice = selectedDevice; getService().mSelectedDevice = selectedDevice;
onSelectionUpdate(); onSelectionUpdate();
} else { } else {
setContentView(R.layout.device_chooser); setContentView(R.layout.device_chooser);
mPairButton = findViewById(R.id.button_pair);
mPairButton.setVisibility(View.GONE); mPairButton.setVisibility(View.GONE);
setTitle(Html.fromHtml(getString(R.string.chooser_title, getCallingAppName()), 0)); setTitle(Html.fromHtml(getString(R.string.chooser_title, getCallingAppName()), 0));
mDeviceListView = findViewById(R.id.device_list); mDeviceListView = findViewById(R.id.device_list);