am df9e20f2: Merge changes Iffd15e95,Id2db95ec

* commit 'df9e20f28839a61dd487c2a67f914e87da1dede9':
  Log notification clicks
  Add userId to StatusBarNotification key
This commit is contained in:
Christoph Studer
2014-05-05 19:07:50 +00:00
committed by Android Git Automerger
7 changed files with 32 additions and 29 deletions

View File

@@ -87,7 +87,7 @@ public class StatusBarNotification implements Parcelable {
}
private String key() {
return pkg + '|' + id + '|' + tag + '|' + uid;
return user.getIdentifier() + "|" + pkg + "|" + id + "|" + tag + "|" + uid;
}
public void writeToParcel(Parcel out, int flags) {

View File

@@ -42,7 +42,7 @@ interface IStatusBarService
out int[] switches, out List<IBinder> binders);
void onPanelRevealed();
void onPanelHidden();
void onNotificationClick(String pkg, String tag, int id, int userId);
void onNotificationClick(String key);
void onNotificationError(String pkg, String tag, int id,
int uid, int initialPid, String message, int userId);
void onClearAllNotifications(int userId);