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

Commit f1f00f5b authored by Dan Egnor's avatar Dan Egnor Committed by Android Git Automerger
Browse files

am 21248080: Merge "Missed these ones in the previous rename." into froyo 

Merge commit '21248080' into froyo-plus-aosp

* commit '21248080':
  Missed these ones in the previous rename.
parents 642d1556 21248080

core/java/android/content/ContentResolver.java

+2 −2
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ public abstract class ContentResolver { 
        String blockingPackage = ActivityThread.currentPackageName();



        EventLog.writeEvent(

            EventLogTags.CONTENT_QUERY_OPERATION,

            EventLogTags.CONTENT_QUERY_SAMPLE,

            uri.toString(),

            projectionBuffer.toString(),

            selection != null ? selection : "",
@@ -1329,7 +1329,7 @@ public abstract class ContentResolver { 
        }

        String blockingPackage = ActivityThread.currentPackageName();

        EventLog.writeEvent(

            EventLogTags.CONTENT_UPDATE_OPERATION,

            EventLogTags.CONTENT_UPDATE_SAMPLE,

            uri.toString(),

            operation,

            selection != null ? selection : "",