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

Commit c5b057f4 authored by Dave Santoro's avatar Dave Santoro Committed by Android Git Automerger
Browse files

am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 

* commit '60e345a9':
  Unhide social stream permissions.
parents 778f146c 60e345a9

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

  }

























core/res/AndroidManifest.xml



+2
−4




























Original line number
Diff line number
Diff line








@@ -263,8 +263,7 @@













        android:label="@string/permlab_writeProfile"















        android:description="@string/permdesc_writeProfile" />





























    <!-- Allows an application to read from the user's social stream.













         @hide -->













    <!-- Allows an application to read from the user's social stream. -->















    <permission android:name="android.permission.READ_SOCIAL_STREAM"















        android:permissionGroup="android.permission-group.PERSONAL_INFO"















        android:protectionLevel="dangerous"









@@ -272,8 +271,7 @@













        android:description="@string/permdesc_readSocialStream" />































    <!-- Allows an application to write (but not read) the user's













         social stream data.













         @hide -->













         social stream data. -->















    <permission android:name="android.permission.WRITE_SOCIAL_STREAM"















        android:permissionGroup="android.permission-group.PERSONAL_INFO"















        android:protectionLevel="dangerous"