diff options
author | Eugene Susla <eugenesusla@google.com> | 2017-07-27 14:03:05 -0700 |
---|---|---|
committer | Eugene Susla <eugenesusla@google.com> | 2017-07-27 14:07:51 -0700 |
commit | 12ea054e90a6eee1350ddcea1f4dc36f8789cc36 (patch) | |
tree | 0ebf3986089fb3166a9339dcccf046893caf9a6a /packages/CompanionDeviceManager/src | |
parent | 3babaf381264ab9fc0589a95ed1bf3deb185fdeb (diff) |
[Companion] Fix NPE due to looking up view btoo soon
Fixes: b/64101223
Test: Ensure attached bug no longer reproduces
Change-Id: I23bb05c5355972ce96d08f620ceb8463df3fe853
Diffstat (limited to 'packages/CompanionDeviceManager/src')
-rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java index 30c1fff5e6ee..7e23ee152ed9 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java @@ -55,8 +55,6 @@ public class DeviceChooserActivity extends Activity { Log.e(LOG_TAG, "About to show UI, but no devices to show"); } - mPairButton = findViewById(R.id.button_pair); - if (getService().mRequest.isSingleDevice()) { setContentView(R.layout.device_confirmation); final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0); @@ -64,11 +62,13 @@ public class DeviceChooserActivity extends Activity { R.string.confirmation_title, getCallingAppName(), selectedDevice.getDisplayName()), 0)); + mPairButton = findViewById(R.id.button_pair); mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice)); getService().mSelectedDevice = selectedDevice; onSelectionUpdate(); } else { setContentView(R.layout.device_chooser); + mPairButton = findViewById(R.id.button_pair); mPairButton.setVisibility(View.GONE); setTitle(Html.fromHtml(getString(R.string.chooser_title, getCallingAppName()), 0)); mDeviceListView = findViewById(R.id.device_list); |