commit 91ade06f93263463475aadddf0cf2bace00eda53
author Kevin Hufnagle <khufnagle@google.com> Mon Sep 26 22:35:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 26 22:35:27 2016 +0000
tree ef85d2d87b768fcc0c9574db847e26652f21553a
parent fe6b57d6aed267a407d6d9a5dfb53c95b7c54bd7
parent 5add769f59c76dc30f881eb6c7b66076e7baf081

Merge "docs: Adjusted return value desc. for getApplicationEnabledSetting" into nyc-dev

core/java/android/content/pm/PackageManager.java

diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index b06568c..7e00edd 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -5417,7 +5417,7 @@
      * {@link #COMPONENT_ENABLED_STATE_DISABLED}, or
      * {@link #COMPONENT_ENABLED_STATE_DEFAULT}.  The last one means the
      * application's enabled state is based on the original information in
-     * the manifest as found in {@link ComponentInfo}.
+     * the manifest as found in {@link ApplicationInfo}.
      * @throws IllegalArgumentException if the named package does not exist.
      */
     public abstract int getApplicationEnabledSetting(String packageName);