diff options
| author | 2011-01-17 12:47:31 -0800 | |
|---|---|---|
| committer | 2011-01-17 12:47:31 -0800 | |
| commit | 22dbfda976aab9ae897eed0625e2e64ead32bbc4 (patch) | |
| tree | befc2b223dfc2b2ad4f6577f2f68aad2d03031a7 /api/11.xml | |
| parent | db7f38673c33ba55801019007ff18fa4c57f75e0 (diff) | |
Add internal plumbing to DPM for encryption
* Add code to persist per-admin setting
* Add hooks for OS-level tie-in (is supported, get / set status)
* Add 3rd API call to get OS status (irrespective of admin settings)
* Remove "REQUESTED" status, no longer relevant with 3rd API
* Fixed bug that impacted global proxy settings
* Update api/11.xml to match current.xml
Bug: 3346770
Change-Id: I56bdf9a7894f6ca4842402c7b82ddb3caf4b37b9
Diffstat (limited to 'api/11.xml')
| -rw-r--r-- | api/11.xml | 281 |
1 files changed, 265 insertions, 16 deletions
diff --git a/api/11.xml b/api/11.xml index c7906d02d72a..9b747bb4768f 100644 --- a/api/11.xml +++ b/api/11.xml @@ -30672,6 +30672,17 @@ <parameter name="listener" type="android.app.FragmentManager.OnBackStackChangedListener"> </parameter> </method> +<method name="beginTransaction" + return="android.app.FragmentTransaction" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="countBackStackEntries" return="int" abstract="true" @@ -30782,7 +30793,7 @@ </method> <method name="openTransaction" return="android.app.FragmentTransaction" - abstract="true" + abstract="false" native="false" synchronized="false" static="false" @@ -37816,7 +37827,7 @@ </parameter> </method> <method name="getStorageEncryption" - return="int" + return="boolean" abstract="false" native="false" synchronized="false" @@ -37828,6 +37839,17 @@ <parameter name="admin" type="android.content.ComponentName"> </parameter> </method> +<method name="getStorageEncryptionStatus" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="hasGrantedPolicy" return="boolean" abstract="false" @@ -38168,7 +38190,7 @@ type="int" transient="false" volatile="false" - value="3" + value="2" static="true" final="true" deprecated="not deprecated" @@ -38179,7 +38201,7 @@ type="int" transient="false" volatile="false" - value="4" + value="3" static="true" final="true" deprecated="not deprecated" @@ -38197,17 +38219,6 @@ visibility="public" > </field> -<field name="ENCRYPTION_STATUS_REQUESTED" - type="int" - transient="false" - volatile="false" - value="2" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="ENCRYPTION_STATUS_UNSUPPORTED" type="int" transient="false" @@ -86359,7 +86370,7 @@ <method name="updateTexImage" return="void" abstract="false" - native="true" + native="false" synchronized="false" static="false" final="false" @@ -95617,6 +95628,17 @@ visibility="public" > </field> +<field name="TOUCHABLE_INSETS_REGION" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TOUCHABLE_INSETS_VISIBLE" type="int" transient="false" @@ -95648,6 +95670,16 @@ visibility="public" > </field> +<field name="touchableRegion" + type="android.graphics.Region" + transient="false" + volatile="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="visibleTopInsets" type="int" transient="false" @@ -167174,6 +167206,38 @@ <parameter name="dimX" type="int"> </parameter> </method> +<method name="setFromFieldPacker" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="xoff" type="int"> +</parameter> +<parameter name="fp" type="android.renderscript.FieldPacker"> +</parameter> +</method> +<method name="setFromFieldPacker" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="xoff" type="int"> +</parameter> +<parameter name="component_number" type="int"> +</parameter> +<parameter name="fp" type="android.renderscript.FieldPacker"> +</parameter> +</method> <method name="syncAll" return="void" abstract="false" @@ -172934,6 +172998,49 @@ deprecated="not deprecated" visibility="public" > +<method name="bindAllocation" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="va" type="android.renderscript.Allocation"> +</parameter> +<parameter name="slot" type="int"> +</parameter> +</method> +<method name="invoke" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="slot" type="int"> +</parameter> +</method> +<method name="invoke" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="slot" type="int"> +</parameter> +<parameter name="v" type="android.renderscript.FieldPacker"> +</parameter> +</method> <method name="setTimeZone" return="void" abstract="false" @@ -172947,6 +173054,111 @@ <parameter name="timeZone" type="java.lang.String"> </parameter> </method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="v" type="float"> +</parameter> +</method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="v" type="double"> +</parameter> +</method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="v" type="int"> +</parameter> +</method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="v" type="long"> +</parameter> +</method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="v" type="boolean"> +</parameter> +</method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="o" type="android.renderscript.BaseObj"> +</parameter> +</method> +<method name="setVar" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +<parameter name="v" type="android.renderscript.FieldPacker"> +</parameter> +</method> </class> <class name="Script.Builder" extends="java.lang.Object" @@ -173078,6 +173290,32 @@ deprecated="not deprecated" visibility="public" > +<constructor name="ScriptC" + type="android.renderscript.ScriptC" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="id" type="int"> +</parameter> +<parameter name="rs" type="android.renderscript.RenderScript"> +</parameter> +</constructor> +<constructor name="ScriptC" + type="android.renderscript.ScriptC" + static="false" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<parameter name="rs" type="android.renderscript.RenderScript"> +</parameter> +<parameter name="resources" type="android.content.res.Resources"> +</parameter> +<parameter name="resourceID" type="int"> +</parameter> +</constructor> </class> <class name="Short2" extends="java.lang.Object" @@ -183534,6 +183772,17 @@ visibility="public" > </method> +<method name="getObbDir" + return="java.io.File" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getPackageCodePath" return="java.lang.String" abstract="false" |