summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-09-15 22:01:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-15 22:01:59 +0000
commit2d360218b4145c7d4079a9266e1c70a47939080d (patch)
tree036961e58340321ffbadd8631ee6a431d49f2dbd /api
parentb5d856a85e947c1e4ccdcdfaa34454e25b30fef2 (diff)
parent49c0e7375b237bc6eff8746ae91466ea6a660233 (diff)
downloadframeworks_base-2d360218b4145c7d4079a9266e1c70a47939080d.zip
frameworks_base-2d360218b4145c7d4079a9266e1c70a47939080d.tar.gz
frameworks_base-2d360218b4145c7d4079a9266e1c70a47939080d.tar.bz2
am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d': Update API naming to follow style guide.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index d5b4f70..6653a49 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8582,11 +8582,11 @@ package android.content.pm {
}
public static class PackageInstaller.SessionInfo implements android.os.Parcelable {
+ method public android.content.Intent createDetailsIntent();
method public int describeContents();
method public android.graphics.Bitmap getAppIcon();
method public java.lang.CharSequence getAppLabel();
method public java.lang.String getAppPackageName();
- method public android.content.Intent getDetailsIntent();
method public java.lang.String getInstallerPackageName();
method public float getProgress();
method public int getSessionId();