summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-07-15 20:14:57 -0700
committerAdam Powell <adamp@google.com>2015-07-16 16:29:59 -0700
commit666d82a6d5c6a90e87591aea1aabac3d647cd541 (patch)
tree1ed5786f84c0ee6fc6695c6e81f58684cd14cede /api
parent5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc (diff)
downloadframeworks_base-666d82a6d5c6a90e87591aea1aabac3d647cd541.zip
frameworks_base-666d82a6d5c6a90e87591aea1aabac3d647cd541.tar.gz
frameworks_base-666d82a6d5c6a90e87591aea1aabac3d647cd541.tar.bz2
Update ChooserTarget constructor to take ComponentName, Bundle
Simplify ChooserTarget handling by requiring a target component and an extras bundle instead of a full PendingIntent/IntentSender. This simplifies the handling of URI grants from sending apps. Prune ChooserTargets that point at ComponentNames that don't share a package with the original matching Activity target or that aren't exported so that we don't show the user something they can't launch. Bug 22516282 Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
Diffstat (limited to 'api')
-rw-r--r--api/current.txt7
-rw-r--r--api/system-current.txt7
2 files changed, 6 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt
index ea33eaf..f4f91a7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28534,14 +28534,13 @@ package android.service.carrier {
package android.service.chooser {
public final class ChooserTarget implements android.os.Parcelable {
- ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.app.PendingIntent);
- ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.content.IntentSender);
+ ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.content.ComponentName, android.os.Bundle);
method public int describeContents();
+ method public android.content.ComponentName getComponentName();
method public android.graphics.drawable.Icon getIcon();
- method public android.content.IntentSender getIntentSender();
+ method public android.os.Bundle getIntentExtras();
method public float getScore();
method public java.lang.CharSequence getTitle();
- method public boolean sendIntent(android.content.Context, android.content.Intent);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.service.chooser.ChooserTarget> CREATOR;
}
diff --git a/api/system-current.txt b/api/system-current.txt
index d1e19fb..4da118a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30594,14 +30594,13 @@ package android.service.carrier {
package android.service.chooser {
public final class ChooserTarget implements android.os.Parcelable {
- ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.app.PendingIntent);
- ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.content.IntentSender);
+ ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.content.ComponentName, android.os.Bundle);
method public int describeContents();
+ method public android.content.ComponentName getComponentName();
method public android.graphics.drawable.Icon getIcon();
- method public android.content.IntentSender getIntentSender();
+ method public android.os.Bundle getIntentExtras();
method public float getScore();
method public java.lang.CharSequence getTitle();
- method public boolean sendIntent(android.content.Context, android.content.Intent);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.service.chooser.ChooserTarget> CREATOR;
}