commit 70ca9034ab65deafd15ba671fdd6fb92b51b3bc6
author Yu Ping Hu <yph@google.com> Sun Mar 17 16:25:20 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Mar 17 16:25:20 2013 +0000
tree f5e1081a540616d486d3ec4d4da1ec5544f6470c
parent c3d66e5ed316c017079799bf037113f6e4cf17e6
parent df1bc0ee93b958c60ec072d5cd599b283ed25fc1

am df1bc0ee: am d0e7d88f: Fix undo to use the correct URI.

* commit 'df1bc0ee93b958c60ec072d5cd599b283ed25fc1':
  Fix undo to use the correct URI.

src/com/android/email/provider/EmailProvider.java

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index d36700e..7776409 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2245,7 +2245,7 @@
                     .add(UIProvider.AccountColumns.FULL_FOLDER_LIST_URI, uriWithId("uiallfolders"))
                     .add(UIProvider.AccountColumns.NAME, AccountColumns.DISPLAY_NAME)
                     .add(UIProvider.AccountColumns.UNDO_URI,
-                            ("'content://" + UIProvider.AUTHORITY + "/uiundo'"))
+                            ("'content://" + EmailContent.AUTHORITY + "/uiundo'"))
                     .add(UIProvider.AccountColumns.URI, uriWithId("uiaccount"))
                     .add(UIProvider.AccountColumns.SEARCH_URI, uriWithId("uisearch"))
                             // TODO: Is provider version used?
@@ -2950,7 +2950,7 @@
         }
         if (colPosMap.containsKey(UIProvider.AccountColumns.UNDO_URI)) {
             values[colPosMap.get(UIProvider.AccountColumns.UNDO_URI)] =
-                    "'content://" + UIProvider.AUTHORITY + "/uiundo'";
+                    "'content://" + EmailContent.AUTHORITY + "/uiundo'";
         }
         if (colPosMap.containsKey(UIProvider.AccountColumns.URI)) {
             values[colPosMap.get(UIProvider.AccountColumns.URI)] =