Merge "Fix condition bug in ResolverActivity"

Author: adamp

core/java/com/android/internal/app/ResolverActivity.java

@@ -261,7 +261,7 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         final int checkedPos = mGrid.getCheckedItemPosition();
         final boolean hasValidSelection = checkedPos != GridView.INVALID_POSITION;
-        if (!hasValidSelection || (mAlwaysUseOption && mLastSelected != checkedPos)) {
+        if (mAlwaysUseOption && (!hasValidSelection || mLastSelected != checkedPos)) {
             mAlwaysButton.setEnabled(hasValidSelection);
             mOnceButton.setEnabled(hasValidSelection);
             if (hasValidSelection) {