Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp

* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
  Missed these ones in the previous rename.
This commit is contained in:
Dan Egnor
2010-04-08 14:15:29 -07:00
committed by Android Git Automerger
parent 642d1556f1 2124808060
commit f1f00f5bdd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/ContentResolver.java
View File

@@ -1307,7 +1307,7 @@ public abstract class ContentResolver {
String blockingPackage = ActivityThread.currentPackageName(); String blockingPackage = ActivityThread.currentPackageName();
EventLog.writeEvent( EventLog.writeEvent(
EventLogTags.CONTENT_QUERY_OPERATION, EventLogTags.CONTENT_QUERY_SAMPLE,
uri.toString(), uri.toString(),
projectionBuffer.toString(), projectionBuffer.toString(),
selection != null ? selection : "", selection != null ? selection : "",
@@ -1329,7 +1329,7 @@ public abstract class ContentResolver {
} }
String blockingPackage = ActivityThread.currentPackageName(); String blockingPackage = ActivityThread.currentPackageName();
EventLog.writeEvent( EventLog.writeEvent(
EventLogTags.CONTENT_UPDATE_OPERATION, EventLogTags.CONTENT_UPDATE_SAMPLE,
uri.toString(), uri.toString(),
operation, operation,
selection != null ? selection : "", selection != null ? selection : "",