Index: chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
index 03acaf4101df64483325698c2ba23a9752700bf7..16693b08b8e33a045903da1732223f9f0ff26ff0 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
@@ -103,11 +103,12 @@ public class ShareHelper { |
sTargetChosenReceiveAction = activity.getPackageName() + "/" |
+ TargetChosenReceiver.class.getName() + "_ACTION"; |
} |
+ Context context = activity.getApplicationContext(); |
if (sLastRegisteredReceiver != null) { |
- activity.unregisterReceiver(sLastRegisteredReceiver); |
+ context.unregisterReceiver(sLastRegisteredReceiver); |
} |
sLastRegisteredReceiver = new TargetChosenReceiver(); |
- activity.registerReceiver( |
+ context.registerReceiver( |
sLastRegisteredReceiver, new IntentFilter(sTargetChosenReceiveAction)); |
} |
@@ -126,7 +127,7 @@ public class ShareHelper { |
public void onReceive(Context context, Intent intent) { |
synchronized (LOCK) { |
if (sLastRegisteredReceiver != this) return; |
- context.unregisterReceiver(sLastRegisteredReceiver); |
+ context.getApplicationContext().unregisterReceiver(sLastRegisteredReceiver); |
sLastRegisteredReceiver = null; |
} |
if (!intent.hasExtra(EXTRA_RECEIVER_TOKEN) |