summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <>2009-03-24 22:47:09 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 22:47:09 -0700
commit7d1e577d5f7ae96bfc533e1c73a3a6a272a4a16d (patch)
tree03096eeac5c7ef97160ea12816f941bf7c359e6a
parent870a2b015645ef5086af6a5de31dc482e7193214 (diff)
downloadframeworks_base-7d1e577d5f7ae96bfc533e1c73a3a6a272a4a16d.zip
frameworks_base-7d1e577d5f7ae96bfc533e1c73a3a6a272a4a16d.tar.gz
frameworks_base-7d1e577d5f7ae96bfc533e1c73a3a6a272a4a16d.tar.bz2
Automated import from //branches/donutburger/...@142472,142472
-rw-r--r--api/current.xml11
-rw-r--r--core/res/AndroidManifest.xml4
2 files changed, 2 insertions, 13 deletions
diff --git a/api/current.xml b/api/current.xml
index ab2857d..706989a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -628,17 +628,6 @@
visibility="public"
>
</field>
-<field name="PACKAGE_USAGE_STATS"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;android.permission.PACKAGE_USAGE_STATS&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
<field name="PERSISTENT_ACTIVITY"
type="java.lang.String"
transient="false"
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9a569a1..3a70d9a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -912,11 +912,11 @@
android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to collect component usage
- statistics -->
+ statistics @hide -->
<permission android:name="android.permission.PACKAGE_USAGE_STATS"
android:label="@string/permlab_pkgUsageStats"
android:description="@string/permdesc_pkgUsageStats"
- android:protectionLevel="normal" />
+ android:protectionLevel="signature" />
<!-- Allows an application to collect battery statistics -->
<permission android:name="android.permission.BATTERY_STATS"