Merge " Hide "clear" action for empty search query." into mnc-dev
diff --git a/src/com/android/contacts/list/ContactPickerFragment.java b/src/com/android/contacts/list/ContactPickerFragment.java
index 0503d33..4e81389 100644
--- a/src/com/android/contacts/list/ContactPickerFragment.java
+++ b/src/com/android/contacts/list/ContactPickerFragment.java
@@ -113,7 +113,7 @@
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- if (position == 0 && mCreateContactEnabled) {
+ if (position == 0 && mCreateContactEnabled && mListener != null) {
mListener.onCreateNewContactAction();
} else {
super.onItemClick(parent, view, position, id);
@@ -142,15 +142,21 @@
}
public void createNewContact() {
- mListener.onCreateNewContactAction();
+ if (mListener != null) {
+ mListener.onCreateNewContactAction();
+ }
}
public void editContact(Uri contactUri) {
- mListener.onEditContactAction(contactUri);
+ if (mListener != null) {
+ mListener.onEditContactAction(contactUri);
+ }
}
public void pickContact(Uri uri) {
- mListener.onPickContactAction(uri);
+ if (mListener != null) {
+ mListener.onPickContactAction(uri);
+ }
}
@Override
@@ -190,11 +196,15 @@
@Override
public void onShortcutIntentCreated(Uri uri, Intent shortcutIntent) {
- mListener.onShortcutIntentCreated(shortcutIntent);
+ if (mListener != null) {
+ mListener.onShortcutIntentCreated(shortcutIntent);
+ }
}
@Override
public void onPickerResult(Intent data) {
- mListener.onPickContactAction(data.getData());
+ if (mListener != null) {
+ mListener.onPickContactAction(data.getData());
+ }
}
}