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

Commit 15ba2780 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Open Source Project
Browse files

Automated import from //branches/master/...@142576,142576

parent 9c802c1e

api/current.xml

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

core/res/AndroidManifest.xml

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