diff options
| author | Martijn Coenen <maco@google.com> | 2012-04-05 11:17:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-05 11:17:03 -0700 |
| commit | 5b4a57973c85afb2f5ec833dc2c202111399b871 (patch) | |
| tree | 589eb1cc9b4a33faeb955e0a39d2136b638d3a3d /core/java/android/nfc/NfcActivityManager.java | |
| parent | 1c35d117f01b5a6f66b82c57eb29350f16694070 (diff) | |
| parent | 20fe5378d73a1c01f8d5a6d3c53c2b4802a0a680 (diff) | |
| download | frameworks_base-5b4a57973c85afb2f5ec833dc2c202111399b871.zip frameworks_base-5b4a57973c85afb2f5ec833dc2c202111399b871.tar.gz frameworks_base-5b4a57973c85afb2f5ec833dc2c202111399b871.tar.bz2 | |
Merge "Make sure initial activity state is correct."
Diffstat (limited to 'core/java/android/nfc/NfcActivityManager.java')
| -rw-r--r-- | core/java/android/nfc/NfcActivityManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java index 8335459..f80dae4 100644 --- a/core/java/android/nfc/NfcActivityManager.java +++ b/core/java/android/nfc/NfcActivityManager.java @@ -114,6 +114,10 @@ public final class NfcActivityManager extends INdefPushCallback.Stub if (activity.getWindow().isDestroyed()) { throw new IllegalStateException("activity is already destroyed"); } + // Check if activity is resumed right now, as we will not + // immediately get a callback for that. + resumed = activity.isResumed(); + this.activity = activity; registerApplication(activity.getApplication()); } |