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

Commit ba989ad0 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8648 into donut 

* changes:
  Use the old string for bookmarks permissions.
parents 5b11a0f3 e7d1c8f3

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""android.permission.READ_HISTORY_BOOKMARKS""

 value=""com.android.browser.permission.READ_HISTORY_BOOKMARKS""

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -1160,7 +1160,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""android.permission.WRITE_HISTORY_BOOKMARKS""

 value=""com.android.browser.permission.WRITE_HISTORY_BOOKMARKS""

 static="true"

 final="true"

 deprecated="not deprecated"

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ 


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

        browsing history and bookmarks. -->

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

    <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"

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

        android:label="@string/permlab_readHistoryBookmarks"

        android:description="@string/permdesc_readHistoryBookmarks"
@@ -217,7 +217,7 @@ 


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

        browsing history and bookmarks. -->

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

    <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"

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

        android:label="@string/permlab_writeHistoryBookmarks"

        android:description="@string/permdesc_writeHistoryBookmarks"