am bc21ba24: am 093f5810: Merge change 27238 into eclair

Merge commit 'bc21ba2410233b40b21a190b26285a791ac5cc58'

* commit 'bc21ba2410233b40b21a190b26285a791ac5cc58':
  The touch screen is probably a feature.
This commit is contained in:
Dianne Hackborn
2009-09-28 01:09:32 -07:00
committed by Android Git Automerger
9 changed files with 124 additions and 1 deletions

View File

@ -41626,6 +41626,19 @@
<parameter name="appInfo" type="android.content.pm.ApplicationInfo">
</parameter>
</method>
<method name="hasSystemFeature"
return="boolean"
abstract="true"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="name" type="java.lang.String">
</parameter>
</method>
<method name="isSafeMode"
return="boolean"
abstract="true"
@ -131377,6 +131390,19 @@
<parameter name="appInfo" type="android.content.pm.ApplicationInfo">
</parameter>
</method>
<method name="hasSystemFeature"
return="boolean"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="name" type="java.lang.String">
</parameter>
</method>
<method name="isSafeMode"
return="boolean"
abstract="false"