am e5e95588: Merge "add ComponentInfo.isEnabled()" into honeycomb

* commit 'e5e9558871df227a09420fed6f16c33e6af0e3e7':
  add ComponentInfo.isEnabled()

api/current.xml

@@ -58398,6 +58398,17 @@
  visibility="public"
 >
 </method>
+<method name="isEnabled"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <field name="applicationInfo"
  type="android.content.pm.ApplicationInfo"
  transient="false"

core/java/android/content/pm/ComponentInfo.java

@@ -98,6 +98,13 @@ public class ComponentInfo extends PackageItemInfo {
         }
         return name;
     }
+
+    /**
+     * Return whether this component and its enclosing application are enabled.
+     */
+    public boolean isEnabled() {
+        return enabled && applicationInfo.enabled;
+    }
     
     /**
      * Return the icon resource identifier to use for this component.  If