Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71348c49 authored by Evan Chen's avatar Evan Chen
Browse files

Change LinearLayoutManager to local variable when attaching to the RecyclerView. 

Test: cts
Fix: 421968394
Flag: EXEMPT bugfix
Change-Id: I4f06a47534aa4fbd3334a2dacb9fa0b1b0064f34
parent 1a065ef5

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
    // onActivityResult() after the association is created.

    private @Nullable DeviceFilterPair<?> mSelectedDevice;



    private final LinearLayoutManager mPermissionsLayoutManager = new LinearLayoutManager(this);



    @Override

    public void onCreate(Bundle savedInstanceState) {

        boolean forceCancelDialog = getIntent().getBooleanExtra(EXTRA_FORCE_CANCEL_CONFIRMATION,
@@ -745,10 +743,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
        mPermissionListAdapter.setAppLabel(mAppLabel);

        mPermissionListAdapter.setDeviceName(mDeviceName);

        mPermissionListRecyclerView.setAdapter(mPermissionListAdapter);

        // Only attach the LinearLayoutManager if it's not already attached.

        if (mPermissionListRecyclerView.getLayoutManager() == null) {

            mPermissionListRecyclerView.setLayoutManager(mPermissionsLayoutManager);

        }

        mPermissionListRecyclerView.setLayoutManager(new LinearLayoutManager(this));



        disableButtons();