summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-12-02 20:24:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-02 20:24:44 -0800
commit8a1b6decfbee41bd513540d86423258743cf8d00 (patch)
treea5e89aede4444540a498acf7ac064fc7f7b9e74e /api
parent9495f8a1547b14590e901bc9420889b380e39a0c (diff)
parente2585127974ce972a013407e2af95d8776a99a8e (diff)
downloadframeworks_base-8a1b6decfbee41bd513540d86423258743cf8d00.zip
frameworks_base-8a1b6decfbee41bd513540d86423258743cf8d00.tar.gz
frameworks_base-8a1b6decfbee41bd513540d86423258743cf8d00.tar.bz2
am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e' * commit 'e2585127974ce972a013407e2af95d8776a99a8e': Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
Diffstat (limited to 'api')
-rw-r--r--api/current.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.xml b/api/current.xml
index 85ed938..d74c950 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -976,7 +976,7 @@
value="&quot;android.permission.SET_PREFERRED_APPLICATIONS&quot;"
static="true"
final="true"
- deprecated="not deprecated"
+ deprecated="deprecated"
visibility="public"
>
</field>
@@ -41119,7 +41119,7 @@
synchronized="false"
static="false"
final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
visibility="public"
>
<parameter name="packageName" type="java.lang.String">
@@ -41872,7 +41872,7 @@
synchronized="false"
static="false"
final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
visibility="public"
>
<parameter name="packageName" type="java.lang.String">