Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev

Browse Source
This commit is contained in:
Martijn Coenen
2014-11-20 17:59:22 +00:00
committed by Android (Google) Code Review
parent ac4af18bbb d8bcfbadf7
commit 2bf6529bf8
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/nfc/INfcAdapter.aidl
View File

@@ -60,4 +60,6 @@ interface INfcAdapter
void addNfcUnlockHandler(INfcUnlockHandler unlockHandler, in int[] techList); void addNfcUnlockHandler(INfcUnlockHandler unlockHandler, in int[] techList);
void removeNfcUnlockHandler(INfcUnlockHandler unlockHandler); void removeNfcUnlockHandler(INfcUnlockHandler unlockHandler);
void verifyNfcPermission();
} }

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

@@ -254,7 +254,11 @@ public final class NfcActivityManager extends IAppCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
// requestNfcServiceCallback() verifies permission also
requestNfcServiceCallback(); requestNfcServiceCallback();
} else {
// Crash API calls early in case NFC permission is missing
verifyNfcPermission();
} }
} }
@@ -268,7 +272,11 @@ public final class NfcActivityManager extends IAppCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
// requestNfcServiceCallback() verifies permission also
requestNfcServiceCallback(); requestNfcServiceCallback();
} else {
// Crash API calls early in case NFC permission is missing
verifyNfcPermission();
} }
} }
@@ -281,7 +289,11 @@ public final class NfcActivityManager extends IAppCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
// requestNfcServiceCallback() verifies permission also
requestNfcServiceCallback(); requestNfcServiceCallback();
} else {
// Crash API calls early in case NFC permission is missing
verifyNfcPermission();
} }
} }
@@ -295,7 +307,11 @@ public final class NfcActivityManager extends IAppCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
// requestNfcServiceCallback() verifies permission also
requestNfcServiceCallback(); requestNfcServiceCallback();
} else {
// Crash API calls early in case NFC permission is missing
verifyNfcPermission();
} }
} }
@@ -308,7 +324,11 @@ public final class NfcActivityManager extends IAppCallback.Stub
isResumed = state.resumed; isResumed = state.resumed;
} }
if (isResumed) { if (isResumed) {
// requestNfcServiceCallback() verifies permission also
requestNfcServiceCallback(); requestNfcServiceCallback();
} else {
// Crash API calls early in case NFC permission is missing
verifyNfcPermission();
} }
} }
@@ -324,6 +344,14 @@ public final class NfcActivityManager extends IAppCallback.Stub
} }
} }
void verifyNfcPermission() {
try {
NfcAdapter.sService.verifyNfcPermission();
} catch (RemoteException e) {
mAdapter.attemptDeadServiceRecovery(e);
}
}
/** Callback from NFC service, usually on binder thread */ /** Callback from NFC service, usually on binder thread */
@Override @Override
public BeamShareData createBeamShareData() { public BeamShareData createBeamShareData() {