commit 217245cd313da247a1debcb94ce2627a2a141bf9
author Dmitri Plotnikov <dplotnikov@google.com> Sat Sep 18 13:04:50 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Sat Sep 18 13:04:50 2010 -0700
tree 33df02837d18c88d3dbce8e0e2d0e049596d0168
parent fc7197e7f1bb7c8745c70a6a33dc0bec0e0fafee

Fixing NPE when Google GAL returns code 406.

Takes care of the crash caused by this:

E/GalProvider(  295): com.google.wireless.gdata2.client.HttpException:
Could not fetch entry http://www.google.com/m8/feeds/gal/google.com
/full/G.b04b5b3a4517c30b: Received 406 status code: Non-profile
lookups are currently not supported

Change-Id: I870a8fd8b15a527e7778341f293f38899c42361f

src/com/android/contacts/views/ContactLoader.java

diff --git a/src/com/android/contacts/views/ContactLoader.java b/src/com/android/contacts/views/ContactLoader.java
index d3b876a..c6555e3 100644
--- a/src/com/android/contacts/views/ContactLoader.java
+++ b/src/com/android/contacts/views/ContactLoader.java
@@ -458,10 +458,12 @@
                 final ContentResolver resolver = getContext().getContentResolver();
                 final Uri uriCurrentFormat = ensureIsContactUri(resolver, mLookupUri);
                 Result result = loadContactEntity(resolver, uriCurrentFormat);
-                if (result.isDirectoryEntry()) {
-                    loadDirectoryMetaData(result);
-                } else if (mLoadGroupMetaData) {
-                    loadGroupMetaData(result);
+                if (result != Result.NOT_FOUND) {
+                    if (result.isDirectoryEntry()) {
+                        loadDirectoryMetaData(result);
+                    } else if (mLoadGroupMetaData) {
+                        loadGroupMetaData(result);
+                    }
                 }
                 return result;
             } catch (Exception e) {