diff options
| author | Dave Santoro <dsantoro@google.com> | 2011-11-17 15:12:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 15:12:52 -0800 |
| commit | c5b057f42372e7a3b0560afe88a243378255c2e2 (patch) | |
| tree | bb19a88f3e5037d8774f06cbf23d3de75f584f5f /api | |
| parent | 778f146cf422edabf140a18afa8746e542a49ebd (diff) | |
| parent | 60e345a9a95a0f24804f729eeb5216012d1bcbac (diff) | |
| download | frameworks_base-c5b057f42372e7a3b0560afe88a243378255c2e2.zip frameworks_base-c5b057f42372e7a3b0560afe88a243378255c2e2.tar.gz frameworks_base-c5b057f42372e7a3b0560afe88a243378255c2e2.tar.bz2 | |
am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
Unhide social stream permissions.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 5c37c06..ebe272b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -83,6 +83,7 @@ package android { field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE"; field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; field public static final java.lang.String READ_SMS = "android.permission.READ_SMS"; + field public static final java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM"; field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS"; field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS"; field public static final java.lang.String REBOOT = "android.permission.REBOOT"; @@ -127,6 +128,7 @@ package android { field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS"; field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS"; field public static final java.lang.String WRITE_SMS = "android.permission.WRITE_SMS"; + field public static final java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM"; field public static final java.lang.String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS"; } |