drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't IPC for every onPause() in NfcActivityManager."

Browse Source
This commit is contained in:
Martijn Coenen
2013-01-08 12:40:37 -08:00
committed by Android (Google) Code Review
parent 3d5161049a 1360c555a4
commit 4cef9969f5
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/nfc/NfcActivityManager.java
View File

@ -197,7 +197,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
requestNfcServiceCallback(true); requestNfcServiceCallback();
} }
} }
@ -211,7 +211,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
requestNfcServiceCallback(true); requestNfcServiceCallback();
} }
} }
@ -223,7 +223,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
requestNfcServiceCallback(true); requestNfcServiceCallback();
} }
} }
@ -236,7 +236,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
requestNfcServiceCallback(true); requestNfcServiceCallback();
} }
} }
@ -249,18 +249,17 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
requestNfcServiceCallback(true); requestNfcServiceCallback();
} }
} }
/** /**
* Request or unrequest NFC service callbacks for NDEF push. * Request or unrequest NFC service callbacks for NDEF push.
* Makes IPC call - do not hold lock. * Makes IPC call - do not hold lock.
* TODO: Do not do IPC on every onPause/onResume
*/ */
void requestNfcServiceCallback(boolean request) { void requestNfcServiceCallback() {
try { try {
NfcAdapter.sService.setNdefPushCallback(request ? this : null); NfcAdapter.sService.setNdefPushCallback(this);
} catch (RemoteException e) { } catch (RemoteException e) {
mAdapter.attemptDeadServiceRecovery(e); mAdapter.attemptDeadServiceRecovery(e);
} }
@ -355,7 +354,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
if (state == null) return; if (state == null) return;
state.resumed = true; state.resumed = true;
} }
requestNfcServiceCallback(true); requestNfcServiceCallback();
} }
/** Callback from Activity life-cycle, on main thread */ /** Callback from Activity life-cycle, on main thread */
@ -367,7 +366,6 @@ public final class NfcActivityManager extends INdefPushCallback.Stub
if (state == null) return; if (state == null) return;
state.resumed = false; state.resumed = false;
} }
requestNfcServiceCallback(false);
} }
/** Callback from Activity life-cycle, on main thread */ /** Callback from Activity life-cycle, on main thread */