summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-20 15:14:16 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-20 15:14:16 -0400
commit7d9db612bdecad3d6667858ac296f5ede27aabfa (patch)
tree2ec1ae89e5868402f375109fd4f43bbdeaf8ad9f
parentd163f4babe101b89aaf322c34d3bafeae237f7da (diff)
parent2dcaafd16755fc757bd86fea81678d3345b77383 (diff)
downloadframeworks_base-7d9db612bdecad3d6667858ac296f5ede27aabfa.zip
frameworks_base-7d9db612bdecad3d6667858ac296f5ede27aabfa.tar.gz
frameworks_base-7d9db612bdecad3d6667858ac296f5ede27aabfa.tar.bz2
Merge change 25885 into eclair
* changes: handle calendars with an access level of "root"
-rw-r--r--core/java/android/provider/Calendar.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index 1de971b..f046cef 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -110,6 +110,7 @@ public final class Calendar {
public static final int EDITOR_ACCESS = 600;
/** Full access to the calendar */
public static final int OWNER_ACCESS = 700;
+ /** Domain admin */
public static final int ROOT_ACCESS = 800;
/**