summaryrefslogtreecommitdiffstats
path: root/docs/html/about
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2015-06-23 06:16:25 +0000
committerBart Sears <bsears@google.com>2015-06-23 06:16:25 +0000
commited5ff51b2ca7c051e2719dfc8a8a083e6208848e (patch)
treedbc4f089cb1b45a7405da654926049b525f57656 /docs/html/about
parenta2991da0d671adf511ccb884cf25bf1241303f92 (diff)
downloadframeworks_base-ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.zip
frameworks_base-ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.tar.gz
frameworks_base-ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.tar.bz2
Revert "Remove not needed contacts related perissions."
Broke the build, reverting. This reverts commit a2991da0d671adf511ccb884cf25bf1241303f92. Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da
Diffstat (limited to 'docs/html/about')
-rw-r--r--docs/html/about/versions/android-4.0.3.jd14
-rw-r--r--docs/html/about/versions/android-4.0.jd10
2 files changed, 12 insertions, 12 deletions
diff --git a/docs/html/about/versions/android-4.0.3.jd b/docs/html/about/versions/android-4.0.3.jd
index 4c2ccb9..5fa8547 100644
--- a/docs/html/about/versions/android-4.0.3.jd
+++ b/docs/html/about/versions/android-4.0.3.jd
@@ -78,19 +78,19 @@ can now sync that data with each of the user’s contacts, providing items in a
stream along with photos for each.</p>
<p>The database table that contains an individual contact’s social stream is
-defined by android.provider.ContactsContract.StreamItems, the Uri for
+defined by {@link android.provider.ContactsContract.StreamItems}, the Uri for
which is nested within the {@link android.provider.ContactsContract.RawContacts}
directory to which the stream items belong. Each social stream table includes
several columns for metadata about each stream item, such as an icon
representing the source (an avatar), a label for the item, the primary text
content, comments about the item (such as responses from other people), and
more. Photos associated with a stream are stored in another table, defined by
-android.provider.ContactsContract.StreamItemPhotos, which is available
-as a sub-directory of the android.provider.ContactsContract.StreamItems
+{@link android.provider.ContactsContract.StreamItemPhotos}, which is available
+as a sub-directory of the {@link android.provider.ContactsContract.StreamItems}
Uri.</p>
-<p>See android.provider.ContactsContract.StreamItems and
-android.provider.ContactsContract.StreamItemPhotos for more information.</p>
+<p>See {@link android.provider.ContactsContract.StreamItems} and
+{@link android.provider.ContactsContract.StreamItemPhotos} for more information.</p>
<p>To read or write social stream items for a contact, an application must
request permission from the user by declaring <code>&lt;uses-permission
@@ -272,8 +272,8 @@ let you check and manage video stabilization for a {@link android.hardware.Camer
<p>The following are new permissions:</p>
<ul>
-<li>android.Manifest.permission#READ_SOCIAL_STREAM and
-android.Manifest.permission#WRITE_SOCIAL_STREAM: Allow a sync
+<li>{@link android.Manifest.permission#READ_SOCIAL_STREAM} and
+{@link android.Manifest.permission#WRITE_SOCIAL_STREAM}: Allow a sync
adapter to read and write social stream data to a contact in the shared
Contacts Provider.</li>
</ul>
diff --git a/docs/html/about/versions/android-4.0.jd b/docs/html/about/versions/android-4.0.jd
index cc1d1c7..6c4ccb4 100644
--- a/docs/html/about/versions/android-4.0.jd
+++ b/docs/html/about/versions/android-4.0.jd
@@ -108,9 +108,9 @@ android.provider.ContactsContract.RawContacts} Uri; instead, you must add a prof
the table at {@link android.provider.ContactsContract.Profile#CONTENT_RAW_CONTACTS_URI}. Raw
contacts in this table are then aggregated into the single user-visible profile labeled "Me".</p>
-<p>Adding a new raw contact for the profile requires the
-android.Manifest.permission#WRITE_PROFILE permission. Likewise, in order to read from the profile
-table, you must request the android.Manifest.permission#READ_PROFILE permission. However,
+<p>Adding a new raw contact for the profile requires the {@link
+android.Manifest.permission#WRITE_PROFILE} permission. Likewise, in order to read from the profile
+table, you must request the {@link android.Manifest.permission#READ_PROFILE} permission. However,
most apps should not need to read the user profile, even when contributing data to the
profile. Reading the user profile is a sensitive permission and you should expect users to be
skeptical of apps that request it.</p>
@@ -1638,9 +1638,9 @@ messages to the device.</li>
android.service.textservice.SpellCheckerService} must require this permission for itself.</li>
<li>{@link android.Manifest.permission#BIND_VPN_SERVICE}: A service that implements {@link
android.net.VpnService} must require this permission for itself.</li>
-<li>android.Manifest.permission#READ_PROFILE: Provides read access to the {@link
+<li>{@link android.Manifest.permission#READ_PROFILE}: Provides read access to the {@link
android.provider.ContactsContract.Profile} provider.</li>
-<li>android.Manifest.permission#WRITE_PROFILE: Provides write access to the {@link
+<li>{@link android.Manifest.permission#WRITE_PROFILE}: Provides write access to the {@link
android.provider.ContactsContract.Profile} provider.</li>
</ul>