diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /services/java/com/android/server/MasterClearReceiver.java | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'services/java/com/android/server/MasterClearReceiver.java')
| -rw-r--r-- | services/java/com/android/server/MasterClearReceiver.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/MasterClearReceiver.java b/services/java/com/android/server/MasterClearReceiver.java index 5a42e76..3c366da 100644 --- a/services/java/com/android/server/MasterClearReceiver.java +++ b/services/java/com/android/server/MasterClearReceiver.java @@ -30,8 +30,8 @@ public class MasterClearReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals("android.intent.action.GTALK_DATA_MESSAGE_RECEIVED")) { - if (!intent.getBooleanExtra("from_trusted_server", false)) { + if (intent.getAction().equals(Intent.ACTION_REMOTE_INTENT)) { + if (!intent.getBooleanExtra("android.intent.extra.from_trusted_server", false)) { Log.w(TAG, "Ignoring master clear request -- not from trusted server."); return; } |