Merge "Fixed ApnEditor crash issue" into pi-dev am: c670be956c

am: 755426d7d8

Change-Id: I575e6775a47a2cd8b8bff3e2ab55309744a72e0a

src/com/android/settings/network/ApnEditor.java

@@ -1195,12 +1195,19 @@ public class ApnEditor extends SettingsPreferenceFragment
         }
     }
 
-    private ApnData getApnDataFromUri(Uri uri) {
+    @VisibleForTesting
-        ApnData apnData;
+    ApnData getApnDataFromUri(Uri uri) {
-        try (Cursor cursor = getActivity().managedQuery(
+        ApnData apnData = null;
-                uri, sProjection, null /* selection */, null /* sortOrder */)) {
+        try (Cursor cursor = getContentResolver().query(
-            cursor.moveToFirst();
+                uri,
-            apnData = new ApnData(uri, cursor);
+                sProjection,
+                null /* selection */,
+                null /* selectionArgs */,
+                null /* sortOrder */)) {
+            if (cursor != null) {
+                cursor.moveToFirst();
+                apnData = new ApnData(uri, cursor);
+            }
         }
 
         if (apnData == null) {

tests/robotests/src/com/android/settings/network/ApnEditorTest.java

@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
@@ -115,6 +116,24 @@ public class ApnEditorTest {
         mApnEditorUT.sNotSet = "Not Set";
     }
 
+    @Test
+    public void testApnEditor_doesNotUseManagedQuery() {
+        mApnEditorUT.getApnDataFromUri(Mockito.mock(Uri.class));
+
+        verify(mActivity, never()).managedQuery(
+                any(Uri.class),
+                any(String[].class),
+                any(String.class),
+                any(String.class));
+
+        verify(mActivity, never()).managedQuery(
+                any(Uri.class),
+                any(String[].class),
+                any(String.class),
+                any(String[].class),
+                any(String.class));
+  }
+
     @Test
     public void testSetStringValue_valueChanged_shouldSetValue() {
         // GIVEN an APN value which is different than the APN value in database