summaryrefslogtreecommitdiff
path: root/core/java/android/app/PendingIntent.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-22 15:21:36 -0700
committerDianne Hackborn <hackbod@google.com>2012-06-25 14:28:48 -0700
commit1927ae8a56a010919a7535231fa0f7db70f7e152 (patch)
treeef0c02adbd41100faf4a18d553ad7206584991d2 /core/java/android/app/PendingIntent.java
parente9b4b3e94d396d176338c62f8c9f4c183b340f9b (diff)
Fix issue #6717667: expanded notification actions don't work on the lock screen
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake. Instead, and the infrastructure for the status bar to take care of closing and hiding things itself when you press these buttons, just like it does for the main Intent of the notification. Bug: 6717667 Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
Diffstat (limited to 'core/java/android/app/PendingIntent.java')
-rw-r--r--core/java/android/app/PendingIntent.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index aa366b6af9a7..8adc8a2625af 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -631,6 +631,20 @@ public final class PendingIntent implements Parcelable {
}
/**
+ * @hide
+ * Check whether this PendingIntent will launch an Activity.
+ */
+ public boolean isActivity() {
+ try {
+ return ActivityManagerNative.getDefault()
+ .isIntentSenderAnActivity(mTarget);
+ } catch (RemoteException e) {
+ // Should never happen.
+ return false;
+ }
+ }
+
+ /**
* Comparison operator on two PendingIntent objects, such that true
* is returned then they both represent the same operation from the
* same package. This allows you to use {@link #getActivity},