Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 181bb0ab to master

Browse Source 
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
This commit is contained in:
Kenny Root
2010-07-16 09:04:09 -07:00
parent a2b78e21b0 181bb0ab46
commit fb4e1e24a9
12 changed files with 517 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
api/current.xml
View File

@@ -82164,7 +82164,7 @@
type="float"
transient="false"
volatile="false"
value="0.0010f"
value="0.001f"
static="true"
final="true"
deprecated="not deprecated"
@@ -129541,6 +129541,32 @@
visibility="public"
>
</method>
<method name="getMountedObbPath"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="filename" type="java.lang.String">
</parameter>
</method>
<method name="isObbMounted"
return="boolean"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="filename" type="java.lang.String">
</parameter>
</method>
<method name="isUsbMassStorageConnected"
return="boolean"
abstract="false"
@@ -129563,6 +129589,21 @@
visibility="public"
>
</method>
<method name="mountObb"
return="boolean"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="filename" type="java.lang.String">
</parameter>
<parameter name="key" type="java.lang.String">
</parameter>
</method>
<method name="registerListener"
return="void"
abstract="false"
@@ -129576,6 +129617,21 @@
<parameter name="listener" type="android.os.storage.StorageEventListener">
</parameter>
</method>
<method name="unmountObb"
return="boolean"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="filename" type="java.lang.String">
</parameter>
<parameter name="force" type="boolean">
</parameter>
</method>
<method name="unregisterListener"
return="void"
abstract="false"
@@ -225998,7 +226054,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="t" type="T">
<parameter name="arg0" type="T">
</parameter>
</method>
</interface>