52aa68f704
The null check for the cursor happens in the try block which causes a null pointer error in the finally block even though we avoid executing the other code because we still try to close the cursor. This change moves that outside of the try block to avoid that. Also added a test to verify that a no-op occurs in the method that uses the enhanced prediction that would have caught this. Additionally, the method for checking if the enhanced prediction was available was not being called in Settings. This CL adds that check and a relevant tests to ensure it is respected. Test: Robotests Bug: 38031439 Change-Id: I6924acb5552baf09a9ff0cdef8e30881115aa1ca