Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5546e9e6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 824838d7: Avoid NPE when callers send null selection args. 

Merge commit '824838d7' into eclair-mr2

* commit '824838d7':
  Avoid NPE when callers send null selection args.
parents 9cf96280 824838d7

core/java/android/content/ContentProviderOperation.java

+6 −2
Original line number Diff line number Diff line
@@ -545,8 +545,12 @@ public class ContentProviderOperation implements Parcelable { 
                        "only updates, deletes, and asserts can have selections");

            }

            mSelection = selection;

            if (selectionArgs == null) {

                mSelectionArgs = null;

            } else {

                mSelectionArgs = new String[selectionArgs.length];

                System.arraycopy(selectionArgs, 0, mSelectionArgs, 0, selectionArgs.length);

            }

            return this;

        }